diff --git a/UPGRADE.md b/UPGRADE.md
index 864466aa9..b6170d04e 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -35,6 +35,14 @@ Optional things you can delete, if they do not contain anything custom.
 
 ### Breaking code changes
 
+#### Removed PATH_* constants
+
+PATH_APP - use app_path()
+PATH_BASE - use base_path()
+PATH_PUBLIC - use public_path()
+PATH_STORAGE - use storage_path()
+PATH_PLUGINS  - use plugins_path()
+
 #### Paginator / setCurrentPage
 
 **App::make('paginator')->setCurrentPage(5);** should no longer be used, instead pass as the second argument with the `paginate()` method `$model->paginate(25, 5);`
@@ -60,7 +68,6 @@ The following methods have changed:
 
 ### Things to do
 
-- Custom Exception Handler needs attention
 - Fix unit tests
 - Dispatcher now native?
 - Cron queue type now native?
\ No newline at end of file
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 2261c7c62..1304ef30b 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -38,7 +38,7 @@ $app->singleton(
 
 $app->singleton(
     'Illuminate\Contracts\Debug\ExceptionHandler',
-    'October\Rain\Foundation\Exceptions\Handler'
+    'October\Rain\Foundation\Exception\Handler'
 );
 
 /*
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 22c5376b0..ea3cd6e8c 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -75,10 +75,10 @@ class ServiceProvider extends ModuleServiceProvider
         /*
          * Error handling for uncaught Exceptions
          */
-        // App::error(function (\Exception $exception, $httpCode) {
-        //     $handler = new ErrorHandler;
-        //     return $handler->handleException($exception, $httpCode);
-        // });
+        Event::listen('exception.beforeRender', function ($exception, $httpCode, $request){
+            $handler = new ErrorHandler;
+            return $handler->handleException($exception, $httpCode);
+        });
 
         /*
          * Write all log events to the database