Error reporting fix
Merge branch 'master' of https://github.com/evoL/dataflow