Additional null check for image loading

Shaun reviewed the change