1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
index 4f1c39c234f..9f5d506545b 100644
--- a/cpp/src/Ice/BatchRequestQueue.cpp
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -90,11 +90,10 @@ void
 BatchRequestQueue::prepareBatchRequest(BasicStream* os)
 {
     Lock sync(*this);
-    if(_exception.get())
+    if(ICE_EXCEPTION_GET(_exception))
     {
-        _exception->ice_throw();
+        ICE_RETHROW_EXCEPTION(_exception);
     }
-
     waitStreamInUse(false);
     _batchStreamInUse = true;
     _batchStream.swap(*os);
@@ -207,7 +206,11 @@ void
 BatchRequestQueue::destroy(const Ice::LocalException& ex)
 {
     Lock sync(*this);
+#ifdef ICE_CPP11_MAPPING
+    _exception = ex.ice_clone();
+#else
     _exception.reset(ex.ice_clone());
+#endif
 }
 
 bool