moved session_or_abort to the right place