Bugfix

Now catches the exception, if the client did not send a pwd field.