diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
index 6ba1ca1..2915906 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
@@ -92,7 +92,8 @@
                 { bundleLocation } );
 
         // CM 1.4 / 104.13.2.4
-        configurationAdmin.checkPermission( delegatee.getBundleLocation() );
+        final String configLocation = delegatee.getBundleLocation();
+        configurationAdmin.checkPermission( ( configLocation == null ) ? "*" : configLocation );
         configurationAdmin.checkPermission( ( bundleLocation == null ) ? "*" : bundleLocation );
         checkDeleted();
         delegatee.setStaticBundleLocation( bundleLocation );