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