This has a fix for the null image name.