Improved handlign of non existant images.
Merge branch 'test' into dev