Handling cases with empty host in url
Merge branch '47-security-fixes'