error event wrapper should always present

Signed-off-by: Vladimir Bulyga <xx@ccxx.cc>
moving error on
Merge pull request #604 from dan-luk/error-wrapper

Wrap error and move on