Prevent errors if image could not be loaded.
Merge remote-tracking branch 'origin/master'