2 files changed, 9 insertions, 2 deletions
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
index 05fc80709e1..40236a873d6 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
@@ -69,7 +69,7 @@ AMDInterceptorI::dispatch(Ice::Request& request)
         for(int i = 0; i < 10; ++i)
         {
 #ifdef ICE_CPP11_MAPPING
-            _lastStatus =  _servant->ice_dispatch(request, nullptr, [](exception_ptr ex) {
+            _lastStatus = _servant->ice_dispatch(request, nullptr, [](exception_ptr ex) {
                 try
                 {
                     rethrow_exception(ex);
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index 02e009fd51e..f1c7586334b 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -124,7 +124,14 @@ MyObjectI::amdAddWithRetryAsync(int x,
 
     if(p == current.ctx.end() || p->second != "no")
     {
-        throw Test::RetryException(__FILE__, __LINE__);
+        try
+        {
+            throw Test::RetryException(__FILE__, __LINE__);
+        }
+        catch(...)
+        {
+            exception(current_exception());
+        }
     }
 }