feat(Image Server): OZF-733 Fix null image id handling