1 files changed, 3 insertions, 5 deletions
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 814806ebba5..7a9e1cf18f3 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -213,7 +213,9 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 
   CORBA::Object_var new_obj = temp_obj;
 
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  // Exception safety is no longer an issue by this point so release
+  // the TAO_Stub from the TAO_Stub_Auto_Ptr.
+  stub = safe_stub.release ();
 
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
@@ -222,10 +224,6 @@ TAO_IOR_Manipulation_impl::remove_profiles (
                         CORBA::Object::_nil ());
     }
 
-  // Exception safety is no longer an issue by this point so release
-  // the TAO_Stub from the TAO_Stub_Auto_Ptr.
-  stub = safe_stub.release ();
-
   return new_obj._retn ();
 }