diff --git a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.cpp b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.cpp
index 7cf73390..52982a87 100644
--- a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.cpp
+++ b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.cpp
@@ -528,7 +528,7 @@ XmlRpcClient::parseResponse(XmlRpcValue& result)
   // Expect either <params><param>... or <fault>...
   if ((XmlRpcUtil::nextTagIs(PARAMS_TAG,_response,&offset) &&
        XmlRpcUtil::nextTagIs(PARAM_TAG,_response,&offset)) ||
-      (XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && (_isFault = true)))
+      (XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && setFault()))
   {
     if ( ! result.fromXml(_response, &offset)) {
       XmlRpcUtil::error("Error in XmlRpcClient::parseResponse: Invalid response value. Response:\n%s", _response.c_str());
diff --git a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.h b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.h
index 433e0120..0b031b18 100644
--- a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.h
+++ b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcClient.h
@@ -141,6 +141,9 @@ namespace XmlRpc {
     // Event dispatcher
     XmlRpcDispatch _disp;
 
+  private:
+    //! Sets the fault flag and returns true.
+    bool setFault() { _isFault = true; return true; }
   };	// class XmlRpcClient
 
 }	// namespace XmlRpc