Return after handling an error

Change-Id: I854de051bc7cac2f4ded3904afc8d0180f641a94
Merge "Return after handling an error"