404 improved.
Merge branch 'hotfix/404Improved'