diff --git a/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java b/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
index 79df353..4a160ad 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
@@ -238,7 +238,8 @@ public class HLMapper {
 	    			logger.warn("The content is null for item: "+itemAb.getId());
 		    		theFileItem.setMimeType(aC.getMimeType());
 		    		theFileItem.setSize(aC.getSize());
-	    		}
+	    		}else
+	    			logger.warn("The content is null for item: "+itemAb.getId());
 
 	    		//TODO ADD VERSION NAME
 
@@ -290,6 +291,10 @@ public class HLMapper {
 			logger.trace("The item: "+item);
 			logger.trace("The item id: "+item.getId());
 
+			if(theItem==null){
+				logger.info("Mapping unknown object as simple FileItem");
+				theItem = new FileItem();
+			}
 			theItem.setId(item.getId());
 			theItem.setName(itemName);
 			theItem.setPath(item.getPath());