diff --git a/src/Error/Error.php b/src/Error/Error.php
index 197c003e9..8ace6b2c5 100644
--- a/src/Error/Error.php
+++ b/src/Error/Error.php
@@ -77,7 +77,7 @@ class Error extends \Exception
         }
 
         $this->lineno = $lineno;
-        $this->filename = $name;
+        $this->name = $name;
         $this->rawMessage = $message;
         $this->updateRepr();
     }
diff --git a/src/Node/ModuleNode.php b/src/Node/ModuleNode.php
index cdf993361..5c825be87 100644
--- a/src/Node/ModuleNode.php
+++ b/src/Node/ModuleNode.php
@@ -202,7 +202,7 @@ class ModuleNode extends Node
                     ->raw(");\n")
                 ;
 
-                $node = $node = $trait->getNode('template');
+                $node = $trait->getNode('template');
                 $compiler
                     ->addDebugInfo($node)
                     ->write(sprintf("if (!\$_trait_%s->isTraitable()) {\n", $i))
@@ -211,7 +211,7 @@ class ModuleNode extends Node
                     ->subcompile($trait->getNode('template'))
                     ->raw(".'\" cannot be used as a trait.', ")
                     ->repr($node->getTemplateLine())
-                    ->raw(", \$this->getSourceContext());\n")
+                    ->raw(", \$this->source);\n")
                     ->outdent()
                     ->write("}\n")
                     ->write(sprintf("\$_trait_%s_blocks = \$_trait_%s->getBlocks();\n\n", $i, $i))
@@ -227,9 +227,9 @@ class ModuleNode extends Node
                         ->string($key)
                         ->raw(' is not defined in trait ')
                         ->subcompile($trait->getNode('template'))
-                        ->raw(".'), ")
+                        ->raw(".', ")
                         ->repr($node->getTemplateLine())
-                        ->raw(", \$this->getSourceContext());\n")
+                        ->raw(", \$this->source);\n")
                         ->outdent()
                         ->write("}\n\n")
 
diff --git a/src/Node/Node.php b/src/Node/Node.php
index af5d97ef2..dce827deb 100644
--- a/src/Node/Node.php
+++ b/src/Node/Node.php
@@ -185,9 +185,7 @@ class Node implements \Countable, \IteratorAggregate
     {
         $this->sourceContext = $source;
         foreach ($this->nodes as $node) {
-            if (null !== $node) {
-                $node->setSourceContext($source);
-            }
+            $node->setSourceContext($source);
         }
     }