corrected bug: null handling for handoff node id