1 files changed, 7 insertions, 1 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
index 2a537c767..172939538 100644
--- a/lib/puppet/network/http/handler.rb
+++ b/lib/puppet/network/http/handler.rb
@@ -13,6 +13,8 @@ class Puppet::Network::HTTP::Handler
         return do_destroy(request, response)    if delete?(request) and singular?(request)
         return do_save(request, response)       if put?(request) and singular?(request)
         raise ArgumentError, "Did not understand HTTP #{http_method(request)} request for '#{path(request)}'"
+    rescue Exception => e
+        return do_exception(request, response, e)
     end
     
   private
@@ -47,6 +49,10 @@ class Puppet::Network::HTTP::Handler
         encode_result(request, response, result)
     end
   
+    def do_exception(request, response, exception, status=404)
+        encode_result(request, response, exception.to_s, status)
+    end
+  
     def find_model_for_handler(handler)
         Puppet::Indirector::Indirection.model(handler) || 
             raise(ArgumentError, "Cannot locate indirection [#{handler}].")
@@ -98,7 +104,7 @@ class Puppet::Network::HTTP::Handler
         raise NotImplementedError
     end
     
-    def encode_result(request, response, result)
+    def encode_result(request, response, result, status = 200)
         raise NotImplementedError
     end
 end