corresponding changes from cpp-ethereum
fix merge conflicts
Merge pull request #5 from cubedro/debris-error_handling_fix

Debris error handling fix