diff --git a/dlight.management/src/org/netbeans/modules/dlight/management/api/impl/DataStorageManager.java b/dlight.management/src/org/netbeans/modules/dlight/management/api/impl/DataStorageManager.java
--- a/dlight.management/src/org/netbeans/modules/dlight/management/api/impl/DataStorageManager.java
+++ b/dlight.management/src/org/netbeans/modules/dlight/management/api/impl/DataStorageManager.java
@@ -143,7 +143,14 @@
     public synchronized  Map<DataStorageType, DataStorage> getDataStoragesFor(DLightSession session, DataCollector<?> collector) {
         Map<DataStorageType, DataStorage> result = new HashMap<DataStorageType, DataStorage>();
         for (DataStorageType type : collector.getRequiredDataStorageTypes()) {
-            result.put(type, getDataStorageFor(session, type, collector.getDataTablesMetadata()));
+            final DataStorage dataStorage = getDataStorageFor(session, type, collector.getDataTablesMetadata());
+            if (dataStorage != null) {
+                result.put(type, dataStorage);
+            } else {
+                DLightLogger.getLogger(DataStorageManager.class).log(Level.INFO,
+                        "DataStorageManager.getDataStoragesFor(session, collector<>) " //NOI18N
+                        + "NULL storage returned for type={0} session={1}", new Object[] {type, session.getDisplayName()});//NOI18N
+            }
         }
         return result;
     }