diff --git a/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js b/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js
index 33040fb6422..cc053c08747 100644
--- a/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js
+++ b/mozilla/extensions/xml-rpc/src/nsXmlRpcClient.js
@@ -39,9 +39,9 @@
 
 /*
  *  nsXmlRpcClient XPCOM component
- *  Version: $Revision: 1.34 $
+ *  Version: $Revision: 1.35 $
  *
- *  $Id: nsXmlRpcClient.js,v 1.34 2004-04-18 22:14:12 gerv%gerv.net Exp $
+ *  $Id: nsXmlRpcClient.js,v 1.35 2005-10-21 22:36:39 bzbarsky%mit.edu Exp $
  */
 
 /*
@@ -254,7 +254,7 @@ nsXmlRpcClient.prototype = {
             catch(ex) {
                 debug('Exception in listener.onFault: ' + ex);
             }
-        } else {
+        } else if (this._result) { 
             debug('Result: ' + this._result);
             try { 
                 this._listener.onResult(this, ctxt, this._result);
@@ -438,9 +438,9 @@ nsXmlRpcClient.prototype = {
         if (this._useAuth){
             if (this._passwordTried){
                 try { 
-                    this._listener.onError(this, ctxt, 
+                    this._listener.onError(this, null, 
                         Components.results.NS_ERROR_FAIL, 
-                        'Server returned invalid Fault');
+                        'Invalid credentials');
                 }
                 catch(ex) {
                     debug('Exception in listener.onError: ' + ex);