Update to check ConnectionToken when call Abort

#2897