Added claim / unclaim checks throwing exceptions.