Fix to tackle instances without an image assigned

fixes bug #1233103

Change-Id: I4d4d7bdff09b6748e14ebac8293050513fb18ed2
Merge "Fix to tackle instances without an image assigned"