adding a little uniqueness, to wrapped errors. Upstream-commit: 331ae9c0f8a57b34b91b460350d0a354822d0091 Component: engine