refactor(errors): implement code review changes

@dominikh do you have some time to have a last look at my changes from
what you adivsed?

Thanks a lot!