Removing an unnecessary catch

Removing an unnecessary catch as the generalized exception
 on line 156 will cover the use case.

Change-Id: Ice2d93e852db508fbeba5a38322c0bcc73a223fb
Merge "Removing an unnecessary catch"