Fix exception propagation