Add image exception

Change-Id: I9836a9d07c7e032783b53b67af5eda070d5e6a38
Merge "Add image exception"