improvements to handling stage

- add stage property to errors emitted instead of additional argument
- add stage in missing places where error is emitted too