Added some error pages
Add new error handling