Build error handling support for password
Fix merge conflicts
Merge pull request #160 from krazemon/passwd

Build error handling support for password