diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
index 7b93491..e2a162d 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
@@ -1154,13 +1154,10 @@
         {
             // Get the bundle's manifest header.
             Map map = getManifestHeader(revision);
-            if (map == null)
-            {
-                map = new HashMap();
-            }
 
             // Find class path meta-data.
-            String classPath = map.get(FelixConstants.BUNDLE_CLASSPATH).toString();
+            String classPath = (map == null)
+                ? null : (String) map.get(FelixConstants.BUNDLE_CLASSPATH);
 
             // Parse the class path into strings.
             String[] classPathStrings = Util.parseDelimitedString(