Handle additional AAE close code paths