Potentially fixing #250 and #299
Fix for #300: "ValueError: Can not build a URL from <class 'core.data.parsers.url.URL'>."