Trimmed error pages
Merge branch 'master' of https://github.com/MwangiKevin/CD4