Properly catch exception if user has no defined password
Merge pull request #1746 from pculture/gh-1745

Properly catch exception if user has no defined password