diff --git a/src/cppgen.py b/src/cppgen.py
index db0898e47b6c5e11d82340c7e989ce415674b932..ff169cc9d43d932521a2b7ac1e68950bcc2c88ec 100644
--- a/src/cppgen.py
+++ b/src/cppgen.py
@@ -1381,7 +1381,7 @@ class FileGenerator:
                         file.write("        setTimeout(" + str(method["timeout"]) + ");\n")
                     if 'retry' in method.keys():
                         file.write("        setRetry(" + str(method["retry"]) + ");\n")
-                    noexcept_flag = "false"
+                    noexcept_flag = "true"
                     if not ('noexcept' in method.keys()):
                         noexcept_flag = "false"
                     file.write("        setNoExcept(" + noexcept_flag + ");\n")
@@ -1540,7 +1540,7 @@ class FileGenerator:
                             file.write('        default: break;\n')
                             file.write('        }\n')
                             file.write('    }\n')
-                            file.write("    getRpc()->getProxyCallManager()->destroy(call->getCallID());\n")
+                            #file.write("    getRpc()->getProxyCallManager()->destroy(call->getCallID());\n")
                         else:
                             file.write("    auto retval = call->doCoroRet();\n")
                             file.write('    if ((errorID != rpc::RpcError::OK) && (!call->getNoExcept())) {\n')