2 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 3331e4b5440..3c51f4d3aad 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -177,11 +177,6 @@ IcePatch2::Client::run(int argc, char* argv[])
         cerr << argv[0] << ": " << ex << endl;
         return EXIT_FAILURE;
     }
-    catch(const char* ex)
-    {
-        cerr << argv[0] << ": " << ex << endl;
-        return EXIT_FAILURE;
-    }
 
     return EXIT_SUCCESS;
 }
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index fa47fb55f8f..f8e7a4adeec 100755
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -43,7 +43,7 @@ IcePatch2::Patcher::patch()
 
     if(dataDir.empty())
     {
-	throw "no data directory specified";
+	throw string("no data directory specified");
     }
 
     if(chunkSize < 1)
@@ -93,7 +93,7 @@ IcePatch2::Patcher::patch()
     const string endpoints = properties->getProperty(endpointsProperty);
     if(endpoints.empty())
     {
-	throw "property `" + endpointsProperty + "' is not set";
+	throw string("property `") + endpointsProperty + "' is not set";
     }
     
     const char* idProperty = "IcePatch2.Identity";
@@ -113,6 +113,8 @@ IcePatch2::Patcher::patch()
     FileInfoSeq updateFiles;
     
     ByteSeq empty(20, 0);
+
+    fileServer = FileServerPrx::uncheckedCast(fileServer->ice_compress(true));
     
     if(tree0.checksum != fileServer->getChecksum())
     {
@@ -121,7 +123,7 @@ IcePatch2::Patcher::patch()
 	ByteSeqSeq checksum0Seq = fileServer->getChecksum0Seq();
 	if(checksum0Seq.size() != 256)
 	{
-	    throw "server returned illegal value";
+	    throw string("server returned illegal value");
 	}
 	
 	for(int node0 = 0; node0 < 256; ++node0)
@@ -157,6 +159,8 @@ IcePatch2::Patcher::patch()
     sort(removeFiles.begin(), removeFiles.end(), FileInfoLess());
     sort(updateFiles.begin(), updateFiles.end(), FileInfoLess());
     
+    fileServer = FileServerPrx::uncheckedCast(fileServer->ice_compress(false)); 
+    
     FileInfoSeq::const_iterator p;
     
     if(!removeFiles.empty())