Minor improvements to error propagation