am a5f48345: Merge "Handle IoException Properly" into jb-ub-mail-ur10

* commit 'a5f483450e0423fdf66393550497c5b396223d3f':
  Handle IoException Properly