diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/authorization/NewDataSetPredicate.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/authorization/NewDataSetPredicate.java
index 977ed3cd686b71398ec20918266dfc5d45891667..158f9f53c1b2d1b0adc58cb2bfb2ccaecd74ec3e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/authorization/NewDataSetPredicate.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/authorization/NewDataSetPredicate.java
@@ -52,11 +52,13 @@ public class NewDataSetPredicate implements
     {
         SpaceIdentifier spaceId = null;
         DataSetOwner owner = newDataSet.getDataSetOwner();
+        String ownerIdentifier = owner.getIdentifier();
         switch (owner.getType())
         {
             case EXPERIMENT:
             {
-                ExperimentIdentifier experimentId = tryExperimentIdentifier(newDataSet);
+                ExperimentIdentifier experimentId =
+                        new ExperimentIdentifierFactory(ownerIdentifier).createIdentifier();
                 spaceId =
                         new SpaceIdentifier(experimentId.getDatabaseInstanceCode(),
                                 experimentId.getSpaceCode());
@@ -64,7 +66,8 @@ public class NewDataSetPredicate implements
             }
             case SAMPLE:
             {
-                SampleIdentifier sampleId = trySampleIdentifier(newDataSet);
+                SampleIdentifier sampleId =
+                        new SampleIdentifierFactory(ownerIdentifier).createIdentifier();
                 spaceId = sampleId.getSpaceLevel();
                 break;
             }
@@ -72,41 +75,4 @@ public class NewDataSetPredicate implements
         return spaceId;
     }
 
-    private ExperimentIdentifier tryExperimentIdentifier(NewDataSetDTO newDataSet)
-    {
-        DataSetOwner owner = newDataSet.getDataSetOwner();
-        switch (owner.getType())
-        {
-            case EXPERIMENT:
-            {
-                return new ExperimentIdentifierFactory(owner.getIdentifier()).createIdentifier();
-            }
-            case SAMPLE:
-            {
-                return null;
-            }
-        }
-
-        return null;
-    }
-
-    private SampleIdentifier trySampleIdentifier(NewDataSetDTO newDataSet)
-    {
-        DataSetOwner owner = newDataSet.getDataSetOwner();
-        switch (owner.getType())
-        {
-            case EXPERIMENT:
-            {
-                return null;
-            }
-            case SAMPLE:
-            {
-                return new SampleIdentifierFactory(owner.getIdentifier()).createIdentifier();
-
-            }
-        }
-
-        return null;
-    }
-
 }