1 files changed, 6 insertions, 7 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index e02b1194e52..94bbe00fd34 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -168,15 +168,14 @@ namespace TAO
     {
       PortableServer::Servant servant = this->default_servant_.in ();
 
-      if (servant != 0)
-        {
-          return servant;
-        }
-      else
+      if (servant == 0)
         {
-          return this->poa_->find_servant (system_id
-                                           ACE_ENV_ARG_PARAMETER);
+          servant = this->poa_->find_servant (system_id
+                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
         }
+
+      return servant;
     }
 
     PortableServer::Servant