Only continue getting checkout value if null

A better version of #4345