Fix error propagation