fix return after exceptions