diff --git a/ipalib/cli.py b/ipalib/cli.py
index 732e38bbd..8cf8d3043 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -377,6 +377,16 @@ class CLI(object):
             if callable(cmd.output_for_cli):
                 cmd.output_for_cli(ret)
             return 0
+        except errors.GenericError, err:
+            code = getattr(err,'faultCode',None)
+            faultString = getattr(err,'faultString',None)
+            if not code:
+                raise err
+            if code < errors.IPA_ERROR_BASE:
+                print "%s: %s" % (code, faultString)
+            else:
+                print "%s: %s" % (code, getattr(err,'__doc__',''))
+            return 1
         except StandardError, e:
             print e
             return 2
diff --git a/ipalib/plugins/b_xmlrpc.py b/ipalib/plugins/b_xmlrpc.py
index 2c98fb8a6..9c6af0a03 100644
--- a/ipalib/plugins/b_xmlrpc.py
+++ b/ipalib/plugins/b_xmlrpc.py
@@ -64,14 +64,7 @@ class xmlrpc(Backend):
             print e[1]
         except xmlrpclib.Fault, e:
             err = errors.convertFault(e)
-            code = getattr(err,'faultCode',None)
-            faultString = getattr(err,'faultString',None)
-            if not code:
-                raise err
-            if code < errors.IPA_ERROR_BASE:
-                print "%s: %s" % (code, faultString)
-            else:
-                print "%s: %s" % (code, getattr(err,'__doc__',''))
+            raise err
         return
 
 api.register(xmlrpc)