diff --git a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
index c48a811..33c2332 100644
--- a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
+++ b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
@@ -70,7 +70,6 @@
     private static List<String> toDelete = new ArrayList<String>();
     private static ResourceResolverFactory cleanupResolverFactory;
     private MappingsFacade mappingsFacade;
-    private static String saveMappingsError;
     
     @TestReference
     private EventsCounter eventsCounter;
@@ -87,13 +86,9 @@
     }
     
     private void saveMappings(Session s) throws Exception {
+        final String saveMappingsError = mappingsFacade.saveMappings(s);
         if(saveMappingsError != null) {
             fail(saveMappingsError);
-        } else {
-            saveMappingsError = mappingsFacade.saveMappings(s);
-            if(saveMappingsError != null) {
-                fail(saveMappingsError);
-            }
         }
     }