diff --git a/impl/src/main/java/com/sun/faces/application/resource/ResourcePathsIterator.java b/impl/src/main/java/com/sun/faces/application/resource/ResourcePathsIterator.java
index 7a40f7fafa..9e393224ad 100644
--- a/impl/src/main/java/com/sun/faces/application/resource/ResourcePathsIterator.java
+++ b/impl/src/main/java/com/sun/faces/application/resource/ResourcePathsIterator.java
@@ -64,7 +64,10 @@ public String next() {
     }
 
     private void visit(String resourcePath) {
-        stack.addAll(externalContext.getResourcePaths(resourcePath));
+        java.util.Set<String> set = externalContext.getResourcePaths(resourcePath);
+        if(set != null) {
+            stack.addAll(set);
+        }
     }
 
     private void tryTake() {