Improved error data passing.