Better checks around onAbort