diff --git a/src/Whoops/Provider/Illuminate/WhoopsServiceProvider.php b/src/Whoops/Provider/Illuminate/WhoopsServiceProvider.php
index c8b49c2..d9d47f2 100644
--- a/src/Whoops/Provider/Illuminate/WhoopsServiceProvider.php
+++ b/src/Whoops/Provider/Illuminate/WhoopsServiceProvider.php
@@ -32,8 +32,10 @@ class WhoopsServiceProvider extends ServiceProvider {
             return $run->pushHandler($app['whoops.handler']);
         });
 
-        $app->error(function($e) use ($app) {
-            $app['whoops']->handleException($e);
-        });
+        if ($app['config']->get('app.debug')) {
+            $app->error(function($e) use ($app) {
+                $app['whoops']->handleException($e);
+            });
+        }
     }
-}
\ No newline at end of file
+}