Fix NPE in Tunnel