Retry logic broken if getting current versions call fails

## The problem

Retry logic still depends on a value which can be undefined or otherwise nil.

## The resolution

Verify the value is non-nil before continuing.