diff --git a/dev/Debug.php b/dev/Debug.php
index c23719e00..9d42ddcc2 100644
--- a/dev/Debug.php
+++ b/dev/Debug.php
@@ -698,13 +698,13 @@ function errorHandler($errno, $errstr, $errfile, $errline) {
 		case E_ERROR:
 		case E_CORE_ERROR:
 		case E_USER_ERROR:
-			Debug::fatalHandler($errno, $errstr, $errfile, $errline, null);
+			Debug::fatalHandler($errno, $errstr, $errfile, $errline, debug_backtrace());
 			break;
 
 		case E_WARNING:
 		case E_CORE_WARNING:
 		case E_USER_WARNING:
-			Debug::warningHandler($errno, $errstr, $errfile, $errline, null);
+			Debug::warningHandler($errno, $errstr, $errfile, $errline, debug_backtrace());
 			break;
 
 		case E_NOTICE:
@@ -712,7 +712,7 @@ function errorHandler($errno, $errstr, $errfile, $errline) {
 		case E_DEPRECATED:
 		case E_USER_DEPRECATED:
 		case E_STRICT:
-			Debug::noticeHandler($errno, $errstr, $errfile, $errline, null);
+			Debug::noticeHandler($errno, $errstr, $errfile, $errline, debug_backtrace());
 			break;
 	}
 }
diff --git a/dev/LogErrorEmailFormatter.php b/dev/LogErrorEmailFormatter.php
index 712b9835d..370a6d5e5 100644
--- a/dev/LogErrorEmailFormatter.php
+++ b/dev/LogErrorEmailFormatter.php
@@ -41,11 +41,8 @@ class SS_LogErrorEmailFormatter implements Zend_Log_Formatter_Interface {
 		$data .= "<p style=\"color: white; background-color: $colour; margin: 0\">"
 			. "[$errorType] $errstr<br />$errfile:$errline\n<br />\n<br />\n</p>\n";
 
-		// Get a backtrace, filtering out debug method calls
-		$data .= SS_Backtrace::backtrace(true, false, array(
-			'SS_LogErrorEmailFormatter->format',
-			'SS_LogEmailWriter->_write'
-		));
+		// Render the provided backtrace
+		$data .= SS_Backtrace::get_rendered_backtrace($errcontext);
 
 		// Compile extra data
 		$blacklist = array('message', 'timestamp', 'priority', 'priorityName');