[client] Fix NPE when connecting to unknown satellite server

1 files changed, 8 insertions, 2 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/FingerprintManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/FingerprintManager.java
index e41e4f28..4ec19dbe 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/FingerprintManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/FingerprintManager.java
@@ -63,7 +63,10 @@ public class FingerprintManager {
 	 * @return fingerprint, null if unknown
 	 */
 	public static byte[] getKnownFingerprint(String address) {
-		return Base64.getDecoder().decode(prop.getProperty(address));
+		String str = prop.getProperty(address);
+		if (str == null)
+			return null;
+		return Base64.getDecoder().decode(str);
 	}
 
 	/**
@@ -74,7 +77,10 @@ public class FingerprintManager {
 	 * @return fingerprint, null if unknown
 	 */
 	public static byte[] getSuggestedFingerprint(String address) {
-		return Base64.getDecoder().decode(prop.getProperty(address + "_master"));
+		String str = prop.getProperty(address + "_master");
+		if (str == null)
+			return null;
+		return Base64.getDecoder().decode(str);
 	}
 
 }