diff --git a/org.knime.knip.io/src/org/knime/knip/io/nodes/annotation/edit/LabelingEditorNodeModel.java b/org.knime.knip.io/src/org/knime/knip/io/nodes/annotation/edit/LabelingEditorNodeModel.java
index d7c2f5ea..fc8e295f 100644
--- a/org.knime.knip.io/src/org/knime/knip/io/nodes/annotation/edit/LabelingEditorNodeModel.java
+++ b/org.knime.knip.io/src/org/knime/knip/io/nodes/annotation/edit/LabelingEditorNodeModel.java
@@ -92,7 +92,7 @@ protected LabelingCell compute(final LabelingValue<?> cellValue1, final ImgPlusV
 		// Get the tracker of the current row
 		final LabelingEditorChangeTracker currentTrack = map.get(k);
 
-		if (!currentTrack.isDirty())
+		if (currentTrack== null || !currentTrack.isDirty())
 			return (LabelingCell) cellValue1;
 
 		RandomAccessibleInterval<LabelingType<String>> src = null;