diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 673761dfb5..d6cd56d6e953357dec8 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -171,8 +171,13 @@ Copyright (c) 2012 Puppet Inc., LLC Licensed under the Apache 2.0 License
puts JSON::pretty_generate(catalog.to_resource, :allow_nan => true, :max_nesting => false)
rescue => detail
- Puppet.log_exception(detail, _("Failed to compile catalog for node %{node}: %{detail}") % { node: options[:node], detail: detail })
- exit(30)
+ begin
+ puts PSON::pretty_generate(catalog.to_resource, :allow_nan => true, :max_nesting => false)
+ Puppet.log_exception(detail,warning _("Failed to compile catalog for node %{node}: %{detail}") % { node: options[:node], detail: detail })
+ rescue => detail
+ Puppet.warninglog_exception(detail, _("Failed to compile catalog for node %{node}: %{detail}") % { node: options[:node], detail: detail })
+ exit(30)
+ end
end
exit(0)
end