Handle exception during "Mark Image"

Change-Id: I0d6871e831c5150366e8a0c8f673ac774c691fce
Merge "Handle exception during "Mark Image""