--- RequestProcessingStrategyServantLocator.cpp.orig	2005-11-04 04:26:55.000000000 -0500
+++ RequestProcessingStrategyServantLocator.cpp	2006-09-18 16:19:37.000000000 -0400
@@ -230,7 +230,8 @@
       // exception the methods normal return is overrriden, the request completes
       // with the exception
 
-      if (!CORBA::is_nil (this->servant_locator_.in ()))
+      if (!CORBA::is_nil (this->servant_locator_.in ()) &&
+	  servant_upcall.servant())
         {
           ACE_DECLARE_NEW_CORBA_ENV;
           ACE_TRY