Increased robustness of parsing.
Merge pull request #1034 from code-dot-org/url_fix

Increased robustness of parsing.