diff --git a/lib/plugins/static.js b/lib/plugins/static.js
index cede1c104..6bfd33feb 100644
--- a/lib/plugins/static.js
+++ b/lib/plugins/static.js
@@ -153,7 +153,7 @@ function serveStatic(options) {
         }
 
         if (req.method !== 'GET' && req.method !== 'HEAD') {
-            next(new MethodNotAllowedError(req.method));
+            next(new MethodNotAllowedError('%s', req.method));
             return;
         }
 
diff --git a/test/plugins/static.test.js b/test/plugins/static.test.js
index a82715918..b59e704ac 100644
--- a/test/plugins/static.test.js
+++ b/test/plugins/static.test.js
@@ -355,4 +355,35 @@ describe('static resource plugin', function () {
             });
         });
     });
+
+    it('static responds 404 for missing file', function (done) {
+        var p = '/public/no-such-file.json';
+        var tmpPath = path.join(process.cwd(), '.tmp');
+
+        SERVER.get(new RegExp('/public/.*'),
+            restify.plugins.serveStatic({directory: tmpPath}));
+
+        CLIENT.get(p, function (err, req, res, obj) {
+            assert.ok(err);
+            assert.equal(err.statusCode, 404);
+            assert.equal(err.restCode, 'ResourceNotFound');
+            return done();
+        });
+    });
+
+    it('GH-1382 static responds 404 for missing file with percent-codes',
+    function (done) {
+        var p = '/public/no-%22such-file.json';
+        var tmpPath = path.join(process.cwd(), '.tmp');
+
+        SERVER.get(new RegExp('/public/.*'),
+            restify.plugins.serveStatic({directory: tmpPath}));
+
+        CLIENT.get(p, function (err, req, res, obj) {
+            assert.ok(err);
+            assert.equal(err.statusCode, 404);
+            assert.equal(err.restCode, 'ResourceNotFound');
+            return done();
+        });
+    });
 });