Merge pull request #640 from metasfresh/gh639

#639 Fix NPE
metasfresh · Oct 20, 2017 · addf0f4 · addf0f4
2 parents 0094137 + 9e2d974
commit addf0f4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentsRepository.java b/src/main/java/de/metas/ui/web/window/model/sql/SqlDocumentsRepository.java
@@ -907,8 +907,9 @@ private static final void saveLabels(final Document document, final IDocumentFie
 		final int linkId = document.getFieldView(lookup.getLinkColumnName()).getValueAsInt(-1);
 		final Set<Object> listValuesInDatabase = lookup.retrieveExistingValues(linkId).getKeys();
 
-		final Set<Object> listValuesToSave = new HashSet<>(documentField.getValueAs(LookupValuesList.class).getKeys());
-
+        final LookupValuesList lookupValuesList = documentField.getValueAs(LookupValuesList.class);
+        final Set<Object> listValuesToSave = lookupValuesList != null ? new HashSet<>(lookupValuesList.getKeys()) : new HashSet<>();
+
 		//
 		// Delete removed labels
 		{