Handle blank urls better