LPS-34667 - handling NoSuchImageExceptions properly
LPS-34667 SF