diff --git a/src/org/bytedream/untisbot/data/Data.java b/src/org/bytedream/untisbot/data/Data.java
index 28e574c..808bb33 100755
--- a/src/org/bytedream/untisbot/data/Data.java
+++ b/src/org/bytedream/untisbot/data/Data.java
@@ -50,7 +50,7 @@ public class Data {
         public String getUsername() {
             try {
                 return crypt.decrypt((String) (data[2]));
-            } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException | InvalidKeySpecException ignore) {
+            } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException | InvalidKeySpecException | NullPointerException ignore) {
                 return null;
             }
         }
@@ -58,7 +58,7 @@ public class Data {
         public String getPassword() {
             try {
                 return crypt.decrypt((String) (data[3]));
-            } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException | InvalidKeySpecException ignore) {
+            } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException | InvalidKeySpecException | NullPointerException ignore) {
                 return null;
             }
         }