1 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java b/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java
index a79fa1c..aba868f 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java
@@ -204,7 +204,17 @@ public class AvailableClient implements Cloneable {
 	}
 
 	public void remoteLogin(Credentials credentials, String resolution) {
-		String username = credentials.getUsername();
+		String username = null, password = null;
+		if (credentials != null) {
+			username = credentials.getUsername();
+			password = credentials.getPassword();
+		}
+		if (username == null) {
+			username = "";
+		}
+		if (password == null) {
+			password = "";
+		}
 		try {
 			LOGGER.info("Logging in user " + username + " on client " + this);
 
@@ -215,7 +225,7 @@ public class AvailableClient implements Cloneable {
 			int version = 1;
 			output.write(version >> 8);
 			output.write(version & 0xFF);
-			String data = username + "\n" + credentials.getPassword() + "\n" + resolution;
+			String data = username + "\n" + password + "\n" + resolution;
 			byte[] enc = Base64.getEncoder().encode(data.getBytes(StandardCharsets.UTF_8));
 			output.write(enc);
 			output.flush();