Catch/protect against unsavable wallet
wording
Merge pull request #963 from achamely/master

Catch/protect against unsavable wallet