Fixed error propagation