Only continue getting checkout value if null
Merge pull request #4420 from ragulka/checkout-get-value

Only continue getting checkout value if null