Fix to not break on empty URLs