diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php
index 79a6e726..0823cbef 100644
--- a/application/core/ErrorHandler.php
+++ b/application/core/ErrorHandler.php
@@ -215,7 +215,7 @@ class ErrorHandler {
 		foreach ($backtrace as $traceStep) {
 			$traceString .= '#' . $stepCount . ': ';
 			if (isset($traceStep['class'])) {
-				if (!$sourceClass && strpos($traceStep['class'], '\\FaultException') === false) {
+				if (!$sourceClass && strpos($traceStep['class'], '\\FaultException') === false && strpos($traceStep['class'], '\\ErrorHandler') === false) {
 					$sourceClass = $traceStep['class'];
 				}
 				$traceString .= $traceStep['class'];