Adding more handling for no dns records