Update for race condition to skip abort when connection already disconnected

#2897