Convert Laravel's ModelNotFoundException into NotFoundHttpException, …

…and display the stack trace

src/Exception/Handler.php

@@ -11,6 +11,7 @@
 use Symfony\Component\HttpFoundation\Response as BaseResponse;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Illuminate\Contracts\Debug\ExceptionHandler as IlluminateExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class Handler implements ExceptionHandler, IlluminateExceptionHandler
 {
@@ -128,6 +129,11 @@ public function register(callable $callback)
      */
     public function handle(Exception $exception)
     {
+        // Convert Eloquent's 500 ModelNotFoundException into a 404 NotFoundHttpException
+        if ($exception instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+            $exception = new NotFoundHttpException($exception->getMessage(), $exception);
+        }
+
         foreach ($this->handlers as $hint => $handler) {
             if (! $exception instanceof $hint) {
                 continue;
@@ -239,6 +245,16 @@ protected function prepareReplacements(Exception $exception)
                 'class' => get_class($exception),
                 'trace' => explode("\n", $exception->getTraceAsString()),
             ];
+
+            // Attach trace of previous exception, if exists
+            if (!is_null($exception->getPrevious())) {
+                $currentTrace = $replacements[':debug']['trace'];
+
+                $replacements[':debug']['trace'] = [
+                    'previous' => explode("\n", $exception->getPrevious()->getTraceAsString()),
+                    'current'  => $currentTrace,
+                ];
+            }
         }
 
         return array_merge($replacements, $this->replacements);