Improved Error Checking for Calendar Page