Add generic error messages
Merge branch 'master' of github.com:varvet/godmin