Nicer Error Handling
Merge branch 'master' of https://github.com/Desocrit/Scripting