1 files changed, 11 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 091264cd4fa..5c6a86c7b44 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1706,7 +1706,17 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
     }
     C << eb;
     writeAllocateCode(C, TypeStringList(), ret);
-    writeUnmarshalCode(C, outParams, ret);
+    if(!outParams.empty() || ret)
+    {
+        C << nl << "try";
+        C << sb;
+        writeUnmarshalCode(C, outParams, ret);
+        C << eb;
+        C << nl << "catch(const ::Ice::LocalException& __ex)";
+        C << sb;
+        C << nl << "throw ::IceInternal::NonRepeatable(__ex);";
+        C << eb;
+    }
     if(ret)
     {
 	C << nl << "return __ret;";