Fixed some issues handling/ignoring caught exceptions.