1 files changed, 3 insertions, 9 deletions
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index b6ebb3da079f..be4065d61479 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -600,22 +600,16 @@ Any ComponentContext::lookupMap( OUString const & rName )
     }
     catch (Exception & exc) // rethrow as WrappedTargetRuntimeException
     {
-        Any caught( getCaughtException() );
         OUStringBuffer buf;
         buf.append( "exception occurred raising singleton \"" );
         buf.append( rName );
         buf.append( "\": " );
         buf.append( exc.Message );
-        throw lang::WrappedTargetRuntimeException(
-            buf.makeStringAndClear(), static_cast<OWeakObject *>(this),caught );
+        SAL_WARN("cppuhelper", buf.makeStringAndClear());
     }
 
-    if (! xInstance.is())
-    {
-        throw RuntimeException(
-            "no service object raising singleton " + rName,
-            static_cast<OWeakObject *>(this) );
-    }
+    SAL_WARN_IF(!xInstance.is(),
+            "cppuhelper", "no service object raising singleton " << rName);
 
     Any ret;
     guard.reset();