Merge "Fixing ImageKilledException raising"