more checking for edge cases in claims parsing