[BACKLOG-824] Adding defensive code to handle null setting.
Merge pull request #2069 from pentaho-nbaker/5.2

[BACKLOG-824] Adding defensive code to handle null setting.