1 files changed, 10 insertions, 2 deletions
diff --git a/tests/RTScheduling/VoidData/test_client.cpp b/tests/RTScheduling/VoidData/test_client.cpp
index f81f48c2378..e2b29cf941c 100644
--- a/tests/RTScheduling/VoidData/test_client.cpp
+++ b/tests/RTScheduling/VoidData/test_client.cpp
@@ -22,8 +22,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       ex._tao_print_exception ("Caught exception:");
 
-      orb->shutdown ();
-      orb->destroy ();
+      try
+        {
+          orb->shutdown ();
+          orb->destroy ();
+        }
+      catch (const CORBA::Exception& ex)
+        {
+          ex._tao_print_exception ("Caught exception while shutting down:");
+          return 1;
+        }
       return 0;
     }