Updated version for release.
Handle invalid URLs better.