Attempt to make reader more robust with further error handling