Expand scope of try/catch
John Reck authored
 Bug: 5458165

Change-Id: I6e2ca495189179086e313e0ed61217649a9b1e8a
e659d7b3