Update Page and add error handling