Remove useless return

This change removes a never executed return after a raise.

Change-Id: I6e6cc1580469f6cc676492c8c27b3e45dd444031
Merge "Remove useless return"