diff --git a/src/Bootstrap.php b/src/Bootstrap.php
index 55b659f8..f96e2e59 100644
--- a/src/Bootstrap.php
+++ b/src/Bootstrap.php
@@ -58,7 +58,9 @@ class Bootstrap
 		}
 		catch (Exception $e)
 		{
-			$this->context->exception = $e;
+			$this->context->transport->errorMessage = rtrim($e->getMessage(), '.') . '.';
+			$this->context->transport->exception = $e;
+			$this->context->transport->success = false;
 			$this->context->viewName = 'error-exception';
 			(new \Chibi\View())->renderFile($this->context->layoutName);
 		}
diff --git a/src/Views/layout-json.phtml b/src/Views/layout-json.phtml
index 906a16be..95dd6d28 100644
--- a/src/Views/layout-json.phtml
+++ b/src/Views/layout-json.phtml
@@ -1 +1,2 @@
+<?php \Chibi\HeadersHelper::set('Content-Type', 'application/json') ?>
 <?php echo json_encode($this->context->transport, true) ?>