Re #1335 Preventing null pointer exception in UrlBuilder.