diff --git a/app/Foundation/Exceptions/Transformers/ExceptionTransformer.php b/app/Foundation/Exceptions/Transformers/BusTransformer.php
similarity index 71%
rename from app/Foundation/Exceptions/Transformers/ExceptionTransformer.php
rename to app/Foundation/Exceptions/Transformers/BusTransformer.php
index 14b63a22..6ffd879a 100644
--- a/app/Foundation/Exceptions/Transformers/ExceptionTransformer.php
+++ b/app/Foundation/Exceptions/Transformers/BusTransformer.php
@@ -14,16 +14,14 @@ namespace CachetHQ\Cachet\Foundation\Exceptions\Transformers;
 use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
 use Exception;
 use GrahamCampbell\Exceptions\Transformers\TransformerInterface;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * This is the exception transformer class.
+ * This is the bus transformer class.
  *
  * @author Graham Campbell <graham@alt-three.com>
  */
-class ExceptionTransformer implements TransformerInterface
+class BusTransformer implements TransformerInterface
 {
     /**
      * Transform the provided exception.
@@ -36,8 +34,6 @@ class ExceptionTransformer implements TransformerInterface
     {
         if ($exception instanceof ExceptionInterface) {
             $exception = new BadRequestHttpException($exception->getMessage());
-        } elseif ($exception instanceof ModelNotFoundException) {
-            $exception = new NotFoundHttpException('Resource not found.');
         }
 
         return $exception;
diff --git a/composer.json b/composer.json
index 4b9e9782..e1de4305 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "graham-campbell/core": "^4.2",
         "graham-campbell/markdown": "^6.0",
         "graham-campbell/throttle": "^5.1",
-        "graham-campbell/exceptions": "^8.2",
+        "graham-campbell/exceptions": "^8.3",
         "guzzlehttp/guzzle": "^6.1",
         "jenssegers/date": "^3.1",
         "mccool/laravel-auto-presenter": "^4.2",
diff --git a/composer.lock b/composer.lock
index 648e86ed..c65925cc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "23040a215cf37e88ed03bb3dc2602aae",
-    "content-hash": "1c679656f822bf0dc48d83459cb5234c",
+    "hash": "a03ddb86888b5d17380401b81539fa2f",
+    "content-hash": "07e7bd2633a541cdb139d05193037ea6",
     "packages": [
         {
             "name": "alt-three/bus",
@@ -1119,16 +1119,16 @@
         },
         {
             "name": "graham-campbell/exceptions",
-            "version": "v8.2.0",
+            "version": "v8.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git",
-                "reference": "32ed22ec846c84475ed40d798bac5c7340f75bec"
+                "reference": "9e5b00e6abff7a91730e52263c4a696aeeeef5d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/32ed22ec846c84475ed40d798bac5c7340f75bec",
-                "reference": "32ed22ec846c84475ed40d798bac5c7340f75bec",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/9e5b00e6abff7a91730e52263c4a696aeeeef5d9",
+                "reference": "9e5b00e6abff7a91730e52263c4a696aeeeef5d9",
                 "shasum": ""
             },
             "require": {
@@ -1152,7 +1152,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.2-dev"
+                    "dev-master": "8.3-dev"
                 }
             },
             "autoload": {
@@ -1184,7 +1184,7 @@
                 "laravel",
                 "whoops"
             ],
-            "time": "2016-01-15 12:51:42"
+            "time": "2016-01-21 12:54:36"
         },
         {
             "name": "graham-campbell/markdown",
@@ -1745,12 +1745,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "30a1c93e08a05e9136cfdaf9b5da7a5039fb6106"
+                "reference": "4966bbda682839d6cd02bbcbc07a6eb984f31ca0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/30a1c93e08a05e9136cfdaf9b5da7a5039fb6106",
-                "reference": "30a1c93e08a05e9136cfdaf9b5da7a5039fb6106",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4966bbda682839d6cd02bbcbc07a6eb984f31ca0",
+                "reference": "4966bbda682839d6cd02bbcbc07a6eb984f31ca0",
                 "shasum": ""
             },
             "require": {
@@ -1865,7 +1865,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2016-01-18 14:30:57"
+            "time": "2016-01-20 20:38:15"
         },
         {
             "name": "league/commonmark",
diff --git a/config/exceptions.php b/config/exceptions.php
index ef806335..992ed2db 100644
--- a/config/exceptions.php
+++ b/config/exceptions.php
@@ -28,7 +28,8 @@ return [
     'transformers' => [
         'GrahamCampbell\Exceptions\Transformers\AuthTransformer',
         'GrahamCampbell\Exceptions\Transformers\CsrfTransformer',
-        'CachetHQ\Cachet\Foundation\Exceptions\Transformers\ExceptionTransformer',
+        'GrahamCampbell\Exceptions\Transformers\ModelTransformer',
+        'CachetHQ\Cachet\Foundation\Exceptions\Transformers\BusTransformer',
     ],
 
     /*
@@ -102,8 +103,8 @@ return [
 
     'levels' => [
         'Illuminate\Auth\Access\AuthorizationException'                 => 'warning',
-        'Illuminate\Session\TokenMismatchException'                     => 'notice',
         'Illuminate\Database\Eloquent\ModelNotFoundException'           => 'warning',
+        'Illuminate\Session\TokenMismatchException'                     => 'notice',
         'Symfony\Component\HttpKernel\Exception\HttpExceptionInterface' => 'warning',
         'Symfony\Component\Debug\Exception\FatalErrorException'         => 'critical',
         'Exception'                                                     => 'error',