NAT fixes, improved error handling