better image empty handling