diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
index fb4cb955051efa3bd925d9876c057301cca1ee51..b73768b7e1ebd96caed2594113e2aa3fe993212c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
@@ -186,7 +186,7 @@ public class VocabularyBO extends AbstractBusinessObject implements IVocabularyB
         final VocabularyTermPE vocabularyTermPE = new VocabularyTermPE();
         vocabularyTermPE.setCode(code);
         vocabularyTermPE.setDescription(description);
-        if (label.length() > 0)
+        if (label != null && label.length() > 0)
         {
             vocabularyTermPE.setLabel(label);
         }