IPv6 support and fixes
Fix NPE