Improve abort condition.