Merge pull request #1488 from akrabat/disable-error-handler

Don't call errorHandler if we don't have one
slimphp · Sep 5, 2015 · faaf470 · faaf470
2 parents a1427aa + 821511e
commit faaf470
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Slim/App.php b/Slim/App.php
@@ -309,6 +309,9 @@ public function run($silent = false)
         } catch (SlimException $e) {
             $response = $e->getResponse();
         } catch (Exception $e) {
+            if (!$this->container->has('errorHandler')) {
+                throw $e;
+            }
             /** @var callable $errorHandler */
             $errorHandler = $this->container->get('errorHandler');
             $response = $errorHandler($request, $response, $e);