Improved exception handling
Merge branch 'master' of https://github.com/wojtasskorcz/hyperflow