Fixed error page
Merge branch 'beta'