diff --git a/system/exception.php b/system/exception.php
index 5c76d66b..3ad1fefe 100644
--- a/system/exception.php
+++ b/system/exception.php
@@ -39,7 +39,7 @@ function exception_handler($exception) {
 	// we just replace some values manually
 	// cause in case Twig throws exception, we can show it too
 	$content = file_get_contents($template_file);
-	$content = str_replace(array('{{ BASE_URL }}', '{{ message }}', '{{ backtrace }}', '{{ powered_by }}'), array(BASE_URL, $message, $backtrace_formatted, base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=')), $content);
+	$content = str_replace(array('{{ BASE_URL }}', '{{ exceptionClass }}', '{{ message }}', '{{ backtrace }}', '{{ powered_by }}'), array(BASE_URL, get_class($exception), $message, $backtrace_formatted, base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=')), $content);
 
 	echo $content;
 }
diff --git a/system/templates/exception.html.twig b/system/templates/exception.html.twig
index 5a259079..6f505245 100644
--- a/system/templates/exception.html.twig
+++ b/system/templates/exception.html.twig
@@ -64,6 +64,8 @@
 	<div class="center wide">
 		<h2 class="wide">Whoops something went wrong...</h2>
 		<div class="error wide">
+			Exception class: {{ exceptionClass }}()
+			<br/><br/>
 			{{ message }}
 			<br/><br/><br/>
 			<b>Backtrace:</b><br/><br/>
@@ -74,4 +76,4 @@
 		<p>{{ powered_by }}</p>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>