diff --git a/webservice/soap/lib.php b/webservice/soap/lib.php
index 5b0d5300093..b3d57dbe785 100644
--- a/webservice/soap/lib.php
+++ b/webservice/soap/lib.php
@@ -77,6 +77,7 @@ final class soap_server extends webservice_server {
 
                 $soap = new Zend_Soap_Server($CFG->wwwroot."/webservice/soap/server.php?wsdl"); // this current file here
                 $soap->setClass('ws_authentication');
+                $soap->registerFaultException(moodle_exception);
                 $soap->handle();
             }
         } else { // if token exist, do the authentication here