diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
index 623f80e3960f866362e9101f0280943e91f3033e..6bc2d3bbaff13a6b4ab0f63e25d441826c29b4ca 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
@@ -79,6 +79,7 @@ public class CifexDataSetInfoExtractor implements IDataSetInfoExtractor
         {
             ExperimentIdentifier experimentIdentifier =
                     new ExperimentIdentifierFactory(info.getExperiment()).createIdentifier();
+            dataSetInformation.setExperimentIdentifier(experimentIdentifier);
             dataSetInformation.setGroupCode(experimentIdentifier.getGroupCode());
             dataSetInformation.setParentDataSetCodes(Arrays.asList(info.getParents()));
         }
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
index 61502dac8798bb242b1fff2381a1eea670fed2be..a32a5ebd61436ee27aaa39be8353d3b3fedd28d0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
@@ -168,6 +168,8 @@ public class DataSetInformation implements Serializable
      * Returns the basic information about the experiment.
      */
     // TODO 2009-09-18 Tomasz Pylak: change to getExperiment()
+    // But it can be null when we use e.g. CifexDataSetInfoExtractor - only identifier is set.
+    // This bean is too complex and can be easily misused...
     public Experiment tryToGetExperiment()
     {
         return experiment == null ? (sample == null ? null : sample.getExperiment()) : experiment;