diff --git a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
index ef59684..3f1cc2d 100644
--- a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
@@ -101,7 +101,7 @@
         public WrapperCapability(Map map)
         {
             super(null, null, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
-            m_map = map;
+            m_map = (map == null) ? Collections.EMPTY_MAP : map;
         }
 
         public WrapperCapability(Dictionary dict, boolean caseSensitive)