Making image_id exception more general
Making image_id exception more general