Improve error handling
Merge branch 'master' of github.com:M66B/XPrivacy