diff --git a/src/Symfony/Bridge/PhpUnit/ErrorAssert.php b/src/Symfony/Bridge/PhpUnit/ErrorAssert.php
index b1594cbc91..0d255bc0f2 100644
--- a/src/Symfony/Bridge/PhpUnit/ErrorAssert.php
+++ b/src/Symfony/Bridge/PhpUnit/ErrorAssert.php
@@ -53,8 +53,14 @@ final class ErrorAssert
             });
 
             $testCode();
-        } finally {
-            restore_error_handler();
+        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+        }
+
+        restore_error_handler();
+
+        if (isset($e)) {
+            throw $e;
         }
 
         \PHPUnit_Framework_Assert::assertCount(count($expectedMessages), $triggeredMessages);