Get rid of ClaimException and use non-exception logic (remove this if useless)