Replace default fqdn by uri.
Better message and logic.