Better abort management