fix nil panic in edge case
update for new hijack protocol