diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
index ff25b0f3..f9032266 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
@@ -34,6 +34,7 @@ import javax.annotation.PostConstruct;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.kurento.client.KurentoClient;
+import org.kurento.commons.exception.KurentoException;
 import org.kurento.jsonrpc.JsonRpcClientClosedException;
 import org.kurento.jsonrpc.client.JsonRpcClientNettyWebSocket;
 import org.kurento.jsonrpc.client.JsonRpcWSConnectionListener;
@@ -329,24 +330,37 @@ public abstract class KmsManager {
 		try {
 			kms.getKurentoClient().getServerManager().getInfo();
 			return true;
-		} catch (JsonRpcClientClosedException e) {
+		} catch (JsonRpcClientClosedException exception) {
 			log.error(
 					"According to Timer KurentoClient [{}] of KMS with uri {} is closed ({}). Initializing a new KurentoClient",
-					kms.getKurentoClient().toString(), kms.getUri(), e.getClass().getName());
-			KurentoClient kClient = createKurentoClient(kms.getId(), kms.getUri());
+					kms.getKurentoClient().toString(), kms.getUri(), exception.getClass().getName());
+			KurentoClient kClient = null;
+			try {
+				kClient = createKurentoClient(kms.getId(), kms.getUri());
+			} catch (KurentoException e) {
+				log.error("Error creating new KurentoClient when connectig to KMS with uri {}. Exception {}: {}",
+						kms.getUri(), e.getClass().getName(), e.getMessage());
+				if (kClient != null) {
+					kClient.destroy();
+				}
+				return false;
+			}
 			try {
 				kClient.getServerManager().getInfo();
 				kms.setKurentoClient(kClient);
 				log.info("Success reconnecting to KMS with uri {} with a new KurentoClient", kms.getUri());
 				return true;
-			} catch (Exception e2) {
+			} catch (Exception e) {
 				log.error("Error reconnecting to KMS with uri {} with a new KurentoClient. Exception {}: {}",
-						kms.getUri(), e2.getClass().getName(), e2.getMessage());
+						kms.getUri(), e.getClass().getName(), e.getMessage());
+				if (kClient != null) {
+					kClient.destroy();
+				}
 				return false;
 			}
-		} catch (Exception e) {
+		} catch (Exception exception) {
 			log.error("According to Timer KMS with uri {} and KurentoClient [{}] is not reconnected yet. Exception {}",
-					kms.getUri(), kms.getKurentoClient().toString(), e.getClass().getName());
+					kms.getUri(), kms.getKurentoClient().toString(), exception.getClass().getName());
 			return false;
 		}
 	}
diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/UpdatableTimerTask.java b/openvidu-server/src/main/java/io/openvidu/server/utils/UpdatableTimerTask.java
index 9160085d..d7470c73 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/utils/UpdatableTimerTask.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/utils/UpdatableTimerTask.java
@@ -56,8 +56,10 @@ public class UpdatableTimerTask extends TimerTask {
 
 	public void cancelTimer() {
 		super.cancel();
-		timer.cancel();
-		timer.purge();
+		if (timer != null) {
+			timer.cancel();
+			timer.purge();
+		}
 	}
 
 	@Override
diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java
index d9e5da91..aae8b131 100644
--- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java
+++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java
@@ -321,7 +321,7 @@ public class OpenViduTestE2e {
 		BrowserUser browserUser = null;
 		GenericContainer<?> container;
 		Path path;
-		
+
 		switch (browser) {
 		case "chrome":
 			container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true);
@@ -715,7 +715,7 @@ public class OpenViduTestE2e {
 			}
 		});
 	}
-	
+
 	private void checkMediafilePath(Path path) throws Exception {
 		if (!Files.exists(path)) {
 			throw new Exception("File " + path.toAbsolutePath().toString() + " does not exist");
@@ -724,4 +724,8 @@ public class OpenViduTestE2e {
 		}
 	}
 
+	public static String getRandom(Set<String> set) {
+		return set.stream().skip((int) (set.size() * Math.random())).findFirst().get();
+	}
+
 }