@bcwaldon We already know the machine URL is a well formed scheme + host. I could do it but it just generates garbage to be cleaned up.

The right solution is probably refactor machine to be stored as a URL.