Add abort traps to prevent stalling