diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
index 9298c2a734838b756888fd4f68634991337e2e42..646e8ff41a660f1d26161e7d294feb504d1c715f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
@@ -249,6 +249,10 @@ public class MetaDataBuilder
     
     private void containerProperties(int number, String subCategory, List<IEntityProperty> properties)
     {
+        if(properties == null) {
+            properties = new ArrayList<IEntityProperty>();
+        }
+        
         if(subCategory != null) {
             addProperties(CONTAINER + "[" + number + "]." + subCategory, properties);
         } else {