Fix exception thrown in 404 page
Merge branch 'develop'