fewer error messages (issues #229 and #239)
removed whitespace from error message
Merge branch 'nightly' into passwords