diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
index d9c456101dd1a9479c6aa1b40bb4e8820b896097..7b33fdcbc96a4ed34ecf604363033a02d48c4cf2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
@@ -120,7 +120,9 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
                                 unarchive(dataset);
                             } catch (UserFailureException ex)
                             {
-                                return Status.createError(ex.getMessage());
+                                return Status
+                                        .createError(ex.getMessage() == null ? "unknown reason"
+                                                : ex.getMessage());
                             }
                             return Status.OK;
                         }
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
index 2fc9bbb9b1abb8926950636a93cbb6373629a4a2..c77a305c2ad6b88649082376a92beaa09cad929a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
@@ -22,7 +22,6 @@ import java.util.List;
 import org.apache.log4j.Logger;
 import org.springframework.remoting.RemoteAccessException;
 
-import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
 import ch.systemsx.cisd.common.TimingParameters;
 import ch.systemsx.cisd.common.collections.CollectionUtils;
@@ -60,9 +59,6 @@ public class QueueingDataSetStatusUpdaterService
 
     private static final int INITIAL_RECORD_SIZE = 128;
 
-    @Private
-    final static String UPDATER_PREFIX = ".UPDATER_";
-
     private static IExtendedBlockingQueue<DataSetCodesWithStatus> queue = null;
 
     private static ICloseable queueCloseableOrNull = null;