Additional null check for image loading

Shaun reviewed the change
Merge remote-tracking branch 'origin/development' into USDA-No-Preload