Don't use data_value if it isn't set

See: https://github.com/GigaOM/legacy-pro/issues/1725
Merge pull request #54 from borkweb/1725-data_value

Don't use data_value if it isn't set