check for user before error. Fix #645
Merge pull request #646 from squirrelo/issue-645

check for user before error. Fix #645