Fix for nil urls