Small error handling and failure fixes in page