@@ -556,8 +556,11 @@ void dispose(int reason)
                 }
 
             }
-            configAdminTracker.dispose();
-
+            if (configAdminTracker != null)
+            {
+            	configAdminTracker.dispose();
+            }
+            
             log(LogService.LOG_DEBUG, "BundleComponentActivator : Bundle [{0}] STOPPED",
                 new Object[] { m_bundle.getBundleId() }, null, null, null);
Original file line number	Diff line number	Diff line change
@@ -556,8 +556,11 @@ void dispose(int reason)
556	556	}
557	557
558	558	}
559		- configAdminTracker.dispose();
560		-
	559	+ if (configAdminTracker != null)
	560	+ {
	561	+ configAdminTracker.dispose();
	562	+ }
	563	+
561	564	log(LogService.LOG_DEBUG, "BundleComponentActivator : Bundle [{0}] STOPPED",
562	565	new Object[] { m_bundle.getBundleId() }, null, null, null);
563	566