some better error handling
Merge branch 'master' of https://github.com/psi46/MoReWeb
Merge branch 'master' of https://github.com/psi46/MoReWeb