--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java	Fri Sep 07 15:58:10 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java	Sat Sep 08 11:26:30 2012 +0000
@@ -8,19 +8,24 @@
         Logger.getLogger(AuthenticationFactory.class);
 
     public static Authenticator getInstance(String name)
-        throws IllegalArgumentException {
-        if (name == null
-        || name.equalsIgnoreCase("was")
-        || name.equalsIgnoreCase("ggina")) {
+        throws IllegalArgumentException
+    {
+        if (name == null) {
+            throw new IllegalArgumentException("Authentication type name is null");
+        }
+        
+        if (name.equalsIgnoreCase("was") ||
+            name.equalsIgnoreCase("ggina")) {
             log.debug("Using GGinA authenticator.");
             return
                 new de.intevation.flys.client.server.auth.was.Authenticator();
         }
-        if (name.equalsIgnoreCase("plain")) {
+        else if (name.equalsIgnoreCase("plain")) {
             log.debug("Using plain authenticator.");
             return
                 new de.intevation.flys.client.server.auth.plain.Authenticator();
         }
+        
         throw new IllegalArgumentException("Unkown Authentication " + name);
     }
 }