Backport fix for nonexistent images to 0.9.x

refs #689 #891