Create before you Claim

[#83638702]

Signed-off-by: Eric Malm <emalm@pivotal.io>