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 e14db397ec840d6c5dc6377e306aec2f75e5b2a0..a77a2273d5d864503ad008809e95d3ce63a31014 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.io.IOException;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.springframework.remoting.RemoteAccessException;
 
 import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
 import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
@@ -107,13 +106,6 @@ public class QueueingDataSetStatusUpdaterService
                                 // that failed before will work too so we can reduce sleep time
                                 // for next failures.
                                 Sleeper.resetSleepTime();
-                            } catch (RemoteAccessException ex)
-                            {
-                                // If connection with openBIS fails it is possible that
-                                // the same problem will occur for other updates in the queue,
-                                // so we just retry after increasing time.
-                                notifyUpdateFailure(dataSets, ex);
-                                Sleeper.sleepAndIncreaseSleepTime();
                             } catch (UserFailureException ex)
                             {
                                 // OpenBIS failure occurred - the problem may be connected with
@@ -123,6 +115,13 @@ public class QueueingDataSetStatusUpdaterService
                                 Sleeper.sleepAndIncreaseSleepTime();
                                 queue.add(dataSets);
                                 queue.remove();
+                            } catch (Exception ex)
+                            {
+                                // If other problems occur it is possible that
+                                // the same problem will occur for other updates in the queue,
+                                // so we just retry after increasing time.
+                                notifyUpdateFailure(dataSets, ex);
+                                Sleeper.sleepAndIncreaseSleepTime();
                             }
                         }
                     } catch (InterruptedException ex)