Merge branch '0.24.x'

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index d4b7449fb..d4655c403 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -24,8 +24,13 @@ 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
+        raise Puppet::ParseError, "Could not parse configuration; cannot compile on node %s" % node.name unless env_parser = parser(node.environment)
+        begin
+          return Puppet::Parser::Compiler.new(node, env_parser).compile
+        rescue => detail
+          puts detail.backtrace if Puppet[:trace]
+          raise Puppet::Error, detail.to_s + " on node %s" % node.name
+        end
     end
 
     # create our interpreter