Fix crashes that should be 404s
Merge pull request #447 from mozilla/fix-404-crash

Fix crashes that should be 404s