Removed unreachable code

In the second try block, it either returns or raises an exception. The
removed code can never be executed.

Change-Id: Iee3e8204c973f4fc6e7dc29fb019dea78cb4a145
Merge "Removed unreachable code"