make sure the value is set before adding it to the dictionary fixes ZEN-...

...15135