Check for existence of values
Merge pull request #1260 from rossriley/path-fixes

Check for existence of values