diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
index ee620c67..53802684 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
@@ -897,7 +897,7 @@ public class KurentoSessionManager extends SessionManager {
 
 		String rtspConnectionId = kMediaOptions.getTypeOfVideo() + "_" + protocol + "_"
 				+ RandomStringUtils.randomAlphanumeric(4).toUpperCase() + "_" + url.getAuthority() + url.getPath();
-		rtspConnectionId = rtspConnectionId.replace("/", "_").replace("-", "").replace(".", "_");
+		rtspConnectionId = rtspConnectionId.replace("/", "_").replace("-", "").replace(".", "_").replace(":", "_");
 		rtspConnectionId = IdentifierPrefixes.IPCAM_ID + rtspConnectionId;
 
 		// Store a "fake" participant for the IpCam connection
diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/GeoLocation.java b/openvidu-server/src/main/java/io/openvidu/server/utils/GeoLocation.java
index 5903b5d4..7d70a431 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/utils/GeoLocation.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/utils/GeoLocation.java
@@ -39,7 +39,11 @@ public class GeoLocation {
 
 	@Override
 	public String toString() {
-		return this.city + ", " + this.country;
+		String location = this.country;
+		if (this.city != null) {
+			location = this.city + ", " + location;
+		}
+		return location;
 	}
 
 }