diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java
index d3d31dbb04154852d085a65738e1b3e59d7f73d5..129c143af90d9951b8b30e61badd53cf1c4ac0de 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java
@@ -101,7 +101,10 @@ public class MetaDataBuilder
             final Boolean completeFlag = dataSet.tryGetAsDataSet().getComplete();
             builder.dataSet("is_complete", BooleanOrUnknown.T.equals(completeFlag));
             builder.dataSet("is_present_in_archive", dataSet.tryGetAsDataSet().isPresentInArchive());
-            builder.dataSet("archiving_status", dataSet.tryGetAsDataSet().getStatus().toString());
+            if (dataSet.tryGetAsDataSet().getStatus() != null)
+            {
+                builder.dataSet("archiving_status", dataSet.tryGetAsDataSet().getStatus().toString());
+            }
         }
         builder.dataSetProperties(dataSet.getProperties());
 
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
index 2f190af4ee3f9022eaf34d85329b8d136826c329..6b89f15cf054e99a4681e4b9e2d3f86358f12d49 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
@@ -645,6 +645,8 @@ public class UploadingCommandTest extends AssertJUnit
                 assertEquals("data_set\tcode\t1\n" + "data_set\tproduction_timestamp\t\n"
                         + "data_set\tproducer_code\t\n" + "data_set\tdata_set_type\tD\n"
                         + "data_set\tis_measured\tFALSE\n" + "data_set\tis_complete\tFALSE\n"
+                        + "data_set\tis_present_in_archive\tFALSE\n"
+                        + "data_set\tarchiving_status\tAVAILABLE\n"
                         + "data_set\tparent_codes\tparent2,parent1\n"
                         + "experiment\tspace_code\tg1\n" + "experiment\tproject_code\tp1\n"
                         + "experiment\texperiment_code\texp1\n"
@@ -659,6 +661,8 @@ public class UploadingCommandTest extends AssertJUnit
                 assertEquals("data_set\tcode\t1\n" + "data_set\tproduction_timestamp\t\n"
                         + "data_set\tproducer_code\t\n" + "data_set\tdata_set_type\tD\n"
                         + "data_set\tis_measured\tFALSE\n" + "data_set\tis_complete\tFALSE\n"
+                        + "data_set\tis_present_in_archive\tFALSE\n"
+                        + "data_set\tarchiving_status\tAVAILABLE\n"
                         + "data_set\tparent_codes\tparent1,parent2\n"
                         + "experiment\tspace_code\tg1\n" + "experiment\tproject_code\tp1\n"
                         + "experiment\texperiment_code\texp1\n"