From 8e39f08cf56f5263b4eb3dc17d10bdaeb185e070 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Tue, 20 May 2014 22:26:18 +0200
Subject: [PATCH] Fixed exception handling

---
 src/Controllers/ErrorController.php | 1 +
 src/Dispatcher.php                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Controllers/ErrorController.php b/src/Controllers/ErrorController.php
index 144f9331..f6a51d0d 100644
--- a/src/Controllers/ErrorController.php
+++ b/src/Controllers/ErrorController.php
@@ -19,6 +19,7 @@ class ErrorController extends AbstractController
 	{
 		\Chibi\Util\Headers::setCode(400);
 		Messenger::fail($exception->getMessage());
+		$context = Core::getContext();
 		$context->transport->exception = $exception;
 		$context->transport->queries = \Chibi\Database::getLogs();
 
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index f557a2d9..448cfda0 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -35,7 +35,7 @@ class Dispatcher
 			$errorController = new ErrorController;
 			$errorController->simpleExceptionView($e);
 		}
-		catch (SimpleException $e)
+		catch (Exception $e)
 		{
 			$errorController = new ErrorController;
 			$errorController->seriousExceptionView($e);