Cleaning up some error messages
Merge pull request #424 from LocutusOfBorg/414-fix

Cleaning up some error messages 1/2
Merge branch 'master' into fix-sleep