=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2013-12-16 11:09:13 +0000
@@ -73,14 +73,20 @@
 
         for ( GenericIdentifiableObjectStore<IdentifiableObject> store : identifiableObjectStores )
         {
-            identifiableObjectStoreMap.put( store.getClazz(), store );
+            if ( store != null && store.getClass() != null )
+            {
+                identifiableObjectStoreMap.put( store.getClazz(), store );
+            }
         }
 
         nameableObjectStoreMap = new HashMap<Class<NameableObject>, GenericNameableObjectStore<NameableObject>>();
 
         for ( GenericNameableObjectStore<NameableObject> store : nameableObjectStores )
         {
-            nameableObjectStoreMap.put( store.getClazz(), store );
+            if ( store != null && store.getClass() != null )
+            {
+                nameableObjectStoreMap.put( store.getClazz(), store );
+            }
         }
     }