Attempt to fix #1040 - catching errors in compilation

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index d4b7449fb..27192af17 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -25,7 +25,11 @@ class Puppet::Parser::Interpreter
     # evaluate our whole tree
     def compile(node)
         raise Puppet::ParseError, "Could not parse configuration; cannot compile" unless env_parser = parser(node.environment)
-        return Puppet::Parser::Compiler.new(node, env_parser).compile
+        begin
+          return Puppet::Parser::Compiler.new(node, env_parser).compile
+        rescue
+          raise Puppet::Error, "Could not compile node %s" % node
+        end
     end
 
     # create our interpreter