handle nil url
Merge branch 'hotfix/fix-nil-url'