Fixing login error handling logic in CLI
Merge remote-tracking branch 'origin/master'