1 files changed, 7 insertions, 2 deletions
diff --git a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
index 5289b0b84d..8a2b1d1c7d 100644
--- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
+++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -38,7 +38,12 @@ module ActionWebService # :nodoc:
       module InstanceMethods # :nodoc:
         private
           def dispatch_web_service_request
-            request = discover_web_service_request(@request)
+            exception = nil
+            begin
+              request = discover_web_service_request(@request)
+            rescue Exception => e
+              exception = e
+            end
             if request
               log_request(request, @request.raw_post)
               response = nil
@@ -57,7 +62,7 @@ module ActionWebService # :nodoc:
                 send_web_service_response(response, bm.real)
               end
             else
-              exception = DispatcherError.new("Malformed SOAP or XML-RPC protocol message")
+              exception ||= DispatcherError.new("Malformed SOAP or XML-RPC protocol message")
               send_web_service_error_response(request, exception)
             end
           rescue Exception => e