PR Change: Propagate exception