Improve error propagation.