Checking request nameserver for NULL, before using it.
Merge remote-tracking branch 'origin/patches-2.0'