Fix sometimes trying to fetch empty URLs