diff --git a/server/index.js b/server/index.js
index 6130c324..9d4d6b2b 100644
--- a/server/index.js
+++ b/server/index.js
@@ -162,7 +162,7 @@ app.get('*', (req, res) => {
 });
 
 // Set error handler. If Sentry is set up, all error responses
-// (500 and up) will be logged there.
+// will be logged there.
 app.use(log.errorHandler());
 
 app.listen(PORT, () => {
diff --git a/server/log.js b/server/log.js
index c50e2217..52d15e9b 100644
--- a/server/log.js
+++ b/server/log.js
@@ -34,7 +34,9 @@ exports.requestHandler = () => {
   if (SENTRY_DSN) {
     return Raven.requestHandler();
   } else {
-    return null;
+    return (req, res, next) => {
+      next();
+    };
   }
 };
 
@@ -46,7 +48,9 @@ exports.errorHandler = () => {
   if (SENTRY_DSN) {
     return Raven.errorHandler();
   } else {
-    return null;
+    return (err, req, res, next) => {
+      next(err);
+    };
   }
 };
 
@@ -60,7 +64,6 @@ exports.errorHandler = () => {
  */
 exports.error = (e, data) => {
   if (SENTRY_DSN) {
-    console.log('logging an exception');
     Raven.captureException(e, { extra: data });
   } else {
     console.error(e);