Changed to deal better with None values
Clean up some typos
Merge branch 'saulshanabrook-fix/url-returns'