diff --git a/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java b/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java
index f26104b..e7a0856 100644
--- a/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java
+++ b/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java
@@ -24,7 +24,7 @@ public class ServerFactory implements Function<JsonObject, Server> {
         final String label = object.has("label") ? object.getAsJsonPrimitive("label").getAsString() : host;
         final int port = object.has("port") ? object.getAsJsonPrimitive("port").getAsInt() : 22;
         final String username = object.getAsJsonPrimitive("username").getAsString();
-        final String password = object.getAsJsonPrimitive("password").getAsString();
+        final String password = object.has("password") ? object.getAsJsonPrimitive("password").getAsString() : null;
         final String path = object.getAsJsonPrimitive("path").getAsString();
         final String url = object.getAsJsonPrimitive("url").getAsString();