diff --git a/core/lib/Drupal/Core/Template/TemplateWithoutErrorHandling.php b/core/lib/Drupal/Core/Template/TemplateWithoutErrorHandling.php
new file mode 100644
index 0000000..8ddac7b
--- /dev/null
+++ b/core/lib/Drupal/Core/Template/TemplateWithoutErrorHandling.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Template\TemplateWithoutErrorHandling.
+ */
+
+namespace Drupal\Core\Template;
+use Twig_Error;
+use Twig_Error_Runtime;
+
+/**
+ * Overrides the base template by removing
+ */
+abstract class TemplateWithoutErrorHandling extends \Twig_Template {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function display(array $context, array $blocks = array()) {
+    try {
+      $this->doDisplay($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
+    } catch (Twig_Error $e) {
+      if (!$e->getTemplateFile()) {
+        $e->setTemplateFile($this->getTemplateName());
+      }
+
+      // this is mostly useful for Twig_Error_Loader exceptions
+      // see Twig_Error_Loader
+      if (false === $e->getTemplateLine()) {
+        $e->setTemplateLine(-1);
+        $e->guess();
+      }
+
+      throw $e;
+    } catch (\Exception $e) {
+      throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getTemplateName(), $e);
+    }
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Template/TwigEnvironment.php b/core/lib/Drupal/Core/Template/TwigEnvironment.php
index dc7de16..67f7994 100644
--- a/core/lib/Drupal/Core/Template/TwigEnvironment.php
+++ b/core/lib/Drupal/Core/Template/TwigEnvironment.php
@@ -58,7 +58,9 @@ public function __construct($root, CacheBackendInterface $cache, \Twig_LoaderInt
       'cache' => TRUE,
       'debug' => FALSE,
       'auto_reload' => NULL,
+      'base_template_class' => 'Drupal\Core\Template\TemplateWithoutErrorHandling',
     );
+
     // Ensure autoescaping is always on.
     $options['autoescape'] = TRUE;