Fixed up error handling, added error page