Fix issue with errors on the claim object