diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
index 59214b6ae40c59758a7e35fa6fb3cfdb6d713e26..7d563c77d5d34cd33c447fc2cb498bf0a3e749d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
@@ -163,7 +163,10 @@ public final class GenericSampleEditForm extends AbstractGenericSampleRegisterEd
         if (projectSamplesEnabled)
         {
             Project project = originalSample.getProject();
-            projectChooser.selectProjectAndUpdateOriginal(project.getIdentifier());
+            if (project != null)
+            {
+                projectChooser.selectProjectAndUpdateOriginal(project.getIdentifier());
+            }
         }
     }