Better error reporting, refactoring
Merge branch 'master' of github.com:M66B/XPrivacy
Revert "Fix block one function permanently from the prompt"

This reverts commit 97cc0ae3e78ba40153f5a657c37b32d4afd2dd0d.