Merge pull request #30 from mbacovsky/2959_error_handling

2959 error handling
fixes #2979 - Add password prompt