1 files changed, 15 insertions, 11 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 2c0fa1933b9..254aa82b888 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1907,19 +1907,10 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
     C << nl << "::IceInternal::BasicStream* __is = __og.is();";
     C << nl << "if(!__ok)";
     C << sb;
+    C << nl << "try";
+    C << sb;
     C << nl << "__is->throwException();";
     C << eb;
-    writeAllocateCode(C, TypeStringList(), ret);
-    writeUnmarshalCode(C, outParams, ret);
-    if(p->returnsClasses())
-    {
-	C << nl << "__is->readPendingObjects();";
-    }
-    if(ret)
-    {
-	C << nl << "return __ret;";
-    }
-    C << eb;
 
     //
     // Generate a catch block for each legal user exception. This is necessary
@@ -1964,6 +1955,19 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
     C << sb;
     C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());";
     C << eb;
+    C << eb;
+
+    writeAllocateCode(C, TypeStringList(), ret);
+    writeUnmarshalCode(C, outParams, ret);
+    if(p->returnsClasses())
+    {
+	C << nl << "__is->readPendingObjects();";
+    }
+    if(ret)
+    {
+	C << nl << "return __ret;";
+    }
+    C << eb;
     C << nl << "catch(const ::Ice::LocalException& __ex)";
     C << sb;
     C << nl << "throw ::IceInternal::NonRepeatable(__ex);";