Fixed exception propagation