Remove condition on Abort exception
Remove catching errors