diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index d3a4599a7..eba6f488e 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -72,10 +72,11 @@ class Handler extends ExceptionHandler
 
             // If we are debugging, return the exception in it's full manner.
             return response()->json([
-                'error' => $e->getMessage(),
+                'error' => (empty($e->getMessage())) ? $exception : $e->getMessage(),
                 'code' => $e->getCode(),
                 'file' => $e->getFile(),
-                'line' => $e->getLine()
+                'line' => $e->getLine(),
+                'trace' => $e->getTrace(),
             ], 500);
 
         }