Better handle no value situations.

The issue where these values were empty was not properly handled.