handle $aborted with a bit more logic

trying to preserve the functionality though