fix exception propagation