fixes #1142
null check for loaded values
fixed test to use test instance factory
Merge pull request #1143 from enesakar/maintenance-issue1142

fixes #1142