Fix problems with wrapped errors in logrus Upstream-commit: 9f30c28d2176b2822b7e66e4b0f462bb6a2cbe36 Component: engine