Revert "Fix nil pointer error in CmdClaim"
This reverts commit 246e7723fd4be771349f822c6ddc30c004cd1b6b.