Remove some gotos

Change-Id: I0e162c8e0a700940f4302786b8523e5b2f5e5c27
1 file changed