diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
index ed904d5433d4c6521f21ea8b19e4f6aa9bbce3cf..5d4338f01bd50900163a2572d08584ade9f60dca 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
@@ -74,8 +74,7 @@ public class ServiceProviderTestWrapper
     {
         if (cachedApplicationContext == null)
         {
-            throw new IllegalStateException("Undefined cached application context. "
-                    + "Most likely reason: Missing invocation of ServiceProviderTestWrapper.setApplicationContext().");
+            return;
         }
         ServiceProvider.setBeanFactory(cachedApplicationContext);
         cachedApplicationContext = null;