Tread invalid url as 404
Merge branch 'stage'