diff --git a/test/model.test.js b/test/model.test.js
index d0686fee..33d81ed9 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -296,6 +296,13 @@ describe('Model', function() {
             done();
           });
       });
+
+      it('Converts null result of findById to 404 Not Found', function(done) {
+        request(app)
+          .get('/users/not-found')
+          .expect(404)
+          .end(done);
+      });
     });
   
     describe('Model.beforeRemote(name, fn)', function(){