throw proper exception when image is not found
Merge remote-tracking branch 'origin/develop' into develop