Index: trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java =================================================================== --- trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java (revision 431306) +++ trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java (working copy) @@ -424,7 +424,9 @@ * @com.intel.drl.spec_ref */ public Iterator getCurrentServiceSelectors(Class serviceClass) { - + if (serviceClass == null) { + return null; + } synchronized (BeanContext.globalHierarchyLock) { synchronized (this.services) { BCSSServiceProvider bcsp = this.services.get(serviceClass);