Multiple exception handling should be within brances

Change-Id: I2753dd7b62dd9fd2f8250a11c050d61474dfa857
Merge "Multiple exception handling should be within brances"