Merge change If5722b3f into eclair

* changes:
  Dont NPE if the thumbnail file cannot be opened.