symfony
diff --git a/‎src/Symfony/Component/Debug/ErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+6-3Lines changed: 6 additions & 3 deletions b/‎src/Symfony/Component/Debug/ErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+6-3Lines changed: 6 additions & 3 deletions
@@ -147,11 +147,14 @@ public static function register($handler = null, $replace = true)
             $handler = $prev[0];
             $replace = false;
         }
-        if ($replace || !$prev) {
-            $handler->setExceptionHandler(set_exception_handler(array($handler, 'handleException')));
-        } else {
+        if (!$replace && $prev) {
             restore_error_handler();
         }
+        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] === $handler) {
+            restore_exception_handler();
+        } else {
+            $handler->setExceptionHandler($prev);
+        }
 
         $handler->throwAt($levels & $handler->thrownErrors, true);