Added trap_exit flag to player