diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 3976e957f..bea49f801 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,7 +1,7 @@
 <?php namespace CachetHQ\Cachet\Exceptions;
 
 use Exception;
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use GrahamCampbell\Exceptions\ExceptionHandler as ExceptionHandler;
 use Illuminate\Support\Facades\Response;
 
 class Handler extends ExceptionHandler
diff --git a/composer.json b/composer.json
index 0a8d37e79..b70c10921 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
         "graham-campbell/binput": "^3.0",
         "graham-campbell/markdown": "^3.0",
         "graham-campbell/throttle": "^3.0",
+        "graham-campbell/exceptions": "^1.0",
         "guzzlehttp/guzzle": "^5.0",
         "jenssegers/date": "^2.0",
         "mccool/laravel-auto-presenter": "^3.0",
diff --git a/composer.lock b/composer.lock
index 2cdd8c3dc..305139e39 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "315ebc7ad98be6ea7ca3499b3f148248",
+    "hash": "e498b782b018084158f8eba6570a322f",
     "packages": [
         {
             "name": "cachethq/segment",
@@ -744,6 +744,64 @@
             ],
             "time": "2015-02-04 20:24:17"
         },
+        {
+            "name": "filp/whoops",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/filp/whoops.git",
+                "reference": "dcce91553e2e056857f1ea844949e9a8a71b613d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/dcce91553e2e056857f1ea844949e9a8a71b613d",
+                "reference": "dcce91553e2e056857f1ea844949e9a8a71b613d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "0.9.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Whoops": "src/"
+                },
+                "classmap": [
+                    "src/deprecated"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Filipe Dobreira",
+                    "homepage": "https://github.com/filp",
+                    "role": "Developer"
+                }
+            ],
+            "description": "php error handling for cool kids",
+            "homepage": "https://github.com/filp/whoops",
+            "keywords": [
+                "error",
+                "exception",
+                "handling",
+                "library",
+                "silex-provider",
+                "whoops",
+                "zf2"
+            ],
+            "time": "2015-02-17 15:50:31"
+        },
         {
             "name": "graham-campbell/binput",
             "version": "v3.0.0",
@@ -805,6 +863,69 @@
             ],
             "time": "2015-02-05 20:08:25"
         },
+        {
+            "name": "graham-campbell/exceptions",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git",
+                "reference": "ac5412d5aca9a2d4dafebf5f85dcb5abcc6d4e25"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/ac5412d5aca9a2d4dafebf5f85dcb5abcc6d4e25",
+                "reference": "ac5412d5aca9a2d4dafebf5f85dcb5abcc6d4e25",
+                "shasum": ""
+            },
+            "require": {
+                "filp/whoops": "1.1.*",
+                "illuminate/contracts": "5.0.*",
+                "illuminate/support": "5.0.*",
+                "php": ">=5.5.0",
+                "psr/log": "~1.0",
+                "symfony/debug": "2.6.*",
+                "symfony/http-foundation": "2.6.*"
+            },
+            "require-dev": {
+                "graham-campbell/testbench": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GrahamCampbell\\Exceptions\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "graham@mineuk.com"
+                }
+            ],
+            "description": "Provides Pretty Error Pages For Both Development And Production",
+            "keywords": [
+                "Graham Campbell",
+                "GrahamCampbell",
+                "Laravel Exceptions",
+                "Laravel-Exceptions",
+                "error",
+                "errors",
+                "exception",
+                "exceptions",
+                "framework",
+                "laravel",
+                "whoops"
+            ],
+            "time": "2015-02-04 20:18:59"
+        },
         {
             "name": "graham-campbell/markdown",
             "version": "v3.0.1",
diff --git a/config/app.php b/config/app.php
index 9d3f9716b..1b71776ed 100644
--- a/config/app.php
+++ b/config/app.php
@@ -142,6 +142,7 @@ return [
          */
         'Fideloper\Proxy\TrustedProxyServiceProvider',
         'GrahamCampbell\Binput\BinputServiceProvider',
+        'GrahamCampbell\Exceptions\ExceptionsServiceProvider',
         'GrahamCampbell\Markdown\MarkdownServiceProvider',
         'GrahamCampbell\Security\SecurityServiceProvider',
         'GrahamCampbell\Throttle\ThrottleServiceProvider',