Enhanced error-message passing