throw a nicer error on unavailability of user credentials.
Merge branch 'master' of github.com:StratusLab/client