diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
index e928dc312c56db9feb1ffd14bdf9dbf9911c10ff..22a53c2ad2bc511b455e1486e389294898b88b99 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
@@ -319,7 +319,7 @@ public class DataSetPropertiesPanel extends JPanel
             } else if (formField instanceof VocabularyTermsComboBoxPanel)
             {
                 VocabularyTermsComboBoxPanel comboBox = (VocabularyTermsComboBoxPanel) formField;
-                if(propertyValue.getClass().isArray()){
+                if(propertyValue != null && propertyValue.getClass().isArray()){
                     Serializable[] values = (Serializable[]) propertyValue;
                     for(Serializable val : values) {
                         setVocabToComboBox(comboBox, (String) val);