Better error handling in a few places'
Merge branch 'master' of https://github.com/furgalep/Schweizer-Messer