Fix Bug:#321 - Crash on wrong password

I have also cleaned up some presented messages. This should not affect translation strings.
Please test on Mac. Previous code required extra code to stabilise Mac, and hopefully is no longer required.