Move abort even earlier