handle $aborted with a bit more logic

trying to preserve the functionality though
yes, not really matter with this line, I just not sure where is the best line to add the comment, so just pick this one.