Manage error pages
Merge branch 'feature/error' into develop

* feature/error:
  Manage error pages