Updated some page error handling