Updated error propagation