Fixes URL nulls
Merge pull request #222 from lukecampbell/urls

Fixes URL nulls