Testing pull request

Added some basic error handling for custom error pages (404, 500)