diff --git a/core/server.js b/core/server.js
index 4f752425c5..7cddae519b 100644
--- a/core/server.js
+++ b/core/server.js
@@ -20,6 +20,12 @@ var express     = require('express'),
     server = express(),
     ghost = new Ghost();
 
+// If we're in development mode, require "when/console/monitor"
+// for help in seeing swallowed promise errors.
+if (process.env.NODE_ENV === 'development') {
+    require('when/monitor/console');
+}
+
 // ##Custom Middleware
 
 // ### Auth Middleware