Refactor manual error handling
Merge branch 'master' of github.com:hpicgs/glow