=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java	2014-01-27 04:59:20 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java	2014-01-27 05:23:09 +0000
@@ -65,7 +65,7 @@
     private Set<IdentifiableObject> identifiableObjects = new HashSet<IdentifiableObject>();
 
     @PostConstruct
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     public void registerListeners()
     {
         EventListenerRegistry registry = ((SessionFactoryImpl) sessionFactory).getServiceRegistry()
@@ -105,11 +105,11 @@
                     }
                 }
 
-                if ( Map.class.isInstance( oldValue ) )
+                Map map = (Map) oldValue;
+
+                for ( Object o : map.keySet() )
                 {
-                    Map map = (Map) oldValue;
-
-                    for ( Object o : map.keySet() )
+                    if ( o instanceof IdentifiableObject )
                     {
                         oldCol.add( o );
                     }