diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java
index 97bb488..98d60ff 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java
@@ -152,10 +152,12 @@
         synchronized ( this.handlers ) {
             this.reporterGenerator = generator;
             for (List<ResourceProviderHandler> list : handlers.values()) {
-                final ResourceProviderHandler h  = list.get(0);
-                if (h != null) {
-                    updateProviderContext(h);
-                    h.update();
+                if ( !list.isEmpty() ) {
+                    final ResourceProviderHandler h = list.get(0);
+                    if (h != null) {
+                        updateProviderContext(h);
+                        h.update();
+                    }
                 }
             }
         }