fix nil handover method
fix handover new bug