diff --git a/Controller/SoapWebServiceController.php b/Controller/SoapWebServiceController.php
index 2576fa5..becd6f5 100644
--- a/Controller/SoapWebServiceController.php
+++ b/Controller/SoapWebServiceController.php
@@ -123,10 +123,14 @@ class SoapWebServiceController extends ContainerAware
             // forward to controller
             try {
                 $response = $this->container->get('http_kernel')->handle($this->soapRequest, HttpKernelInterface::SUB_REQUEST, false);
-            } catch (\SoapFault $e) {
+            } catch (\Exception $e) {
                 $this->soapResponse = new Response(null, 500);
 
-                throw $e;
+                if ($this->container->getParameter('kernel.debug')) {
+                    throw $e;
+                }
+
+                throw new \SoapFault('Receiver', $e->getMessage());
             }
 
             $this->setResponse($response);