check if token is null during handshake to avoid exceptions
Merge branch 'hotfix-check-no-token-on-login'