diff --git a/core/src/main/java/org/jbundle/util/osgi/finder/BaseClassFinderService.java b/core/src/main/java/org/jbundle/util/osgi/finder/BaseClassFinderService.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/jbundle/util/osgi/finder/BaseClassFinderService.java
+++ b/core/src/main/java/org/jbundle/util/osgi/finder/BaseClassFinderService.java
@@ -67,7 +67,8 @@ public abstract class BaseClassFinderService extends Object
         
         bundleContext = context;
 
-        context.registerService(ClassFinder.class.getName(), this, null);	// Should be only one of these
+        if (context != null)
+            context.registerService(ClassFinder.class.getName(), this, null);	// Should be only one of these
     }
     /**
      * Bundle shutting down.
Finish osgi utility deployment