Better error handling when either user or pw is not provided during login.
Merge branch 'test' into dev