diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
index 1d5add2a6bb938f9f7ad21e7e41000c68df4faa6..ef36ec727f6040d7e88c7155bd704fa011e849e4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
@@ -375,6 +375,11 @@ final class DataDAO extends AbstractGenericEntityWithPropertiesDAO<DataPE> imple
         assert dataset != null : "Unspecified data set.";
 
         dataset.setCode(CodeConverter.tryToDatabase(dataset.getCode()));
+        if (false == dataset.isPlaceholder())
+        {
+            validatePE(dataset);
+        }
+
         final HibernateTemplate template = getHibernateTemplate();
         if (operationLog.isInfoEnabled())
         {