Error pages

Merged Jonathan-Sebastian Halmen requested to merge error_pages into master

fix error pages

Merge request reports