Improved abort condition