diff --git a/Exareme-Docker/files/root/exareme/bootstrap.sh b/Exareme-Docker/files/root/exareme/bootstrap.sh
index 770571f6..87230063 100755
--- a/Exareme-Docker/files/root/exareme/bootstrap.sh
+++ b/Exareme-Docker/files/root/exareme/bootstrap.sh
@@ -14,7 +14,7 @@ CONSUL_WAIT_FOR_MASTER_IP_MAX_ATTEMPTS=20
 EXAREME_NODE_STARTUP_HEALTH_CHECK_MAX_ATTEMPTS=10
 EXAREME_NODE_HEALTH_CHECK_TIMEOUT=60
 MASTER_NODE_REACHABLE_TIMEOUT=5
-PERIODIC_EXAREME_NODES_HEALTH_CHECK_MAX_RETRIES=3
+PERIODIC_EXAREME_NODES_HEALTH_CHECK_MAX_RETRIES=5
 PERIODIC_EXAREME_NODES_HEALTH_CHECK_INTERVAL=120
 EXAREME_HEALTH_CHECK_AWAIT_TIME=20
 PERIODIC_TEMP_FILES_REMOVAL=300
diff --git a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/client/rmi/RmiAdpDBClientQueryStatus.java b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/client/rmi/RmiAdpDBClientQueryStatus.java
index d5678073..2e627f04 100644
--- a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/client/rmi/RmiAdpDBClientQueryStatus.java
+++ b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/client/rmi/RmiAdpDBClientQueryStatus.java
@@ -141,9 +141,9 @@ public String getResult(DataSerialization ds) throws RemoteException {
                     IOUtils.toString(resultStream, StandardCharsets.UTF_8));
 
             new Thread(getResultFromStream).start();
-            result = getResultFromStream.get(10, java.util.concurrent.TimeUnit.SECONDS);
+            result = getResultFromStream.get(30, java.util.concurrent.TimeUnit.SECONDS);
         } catch (Exception e) {
-            log.error("Error reading the result table!", e);
+            log.error("Error reading the result table! QueryID:" + status.getQueryID().getQueryID(), e);
             throw new RemoteException("Could not read the result table!");
         }