BIS-1034: Fixed NullPointerException in DataSetUploadClient

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);