1 files changed, 9 insertions, 3 deletions
diff --git a/tests/POA/EndpointPolicy/server.cpp b/tests/POA/EndpointPolicy/server.cpp
index 3b2f0887539..dc65656f201 100644
--- a/tests/POA/EndpointPolicy/server.cpp
+++ b/tests/POA/EndpointPolicy/server.cpp
@@ -347,9 +347,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ex._tao_print_exception ("cannot run server");
     }
-  root_poa->destroy (1, 1);
-
-  orb->destroy ();
+  try
+    {
+      root_poa->destroy (1, 1);
 
+      orb->destroy ();
+    }
+  catch (CORBA::Exception &ex)
+    {
+      ex._tao_print_exception ("CORBA exception during shutdown");
+    }
   return 0;
 }