Fixing data flowing on error
0.5.6