Improved handlign of non existant images.