am 6cb16461: am 91825062: add check for FileNotFoundException

Merge commit '6cb16461e1524eb3272b4e9440db6c041feacbb3'

* commit '6cb16461e1524eb3272b4e9440db6c041feacbb3':
  add check for FileNotFoundException