remove not needed return and break

break after throw is not executed

return; at end of function is not needed

Change-Id: I7c1c1799f78da11b7607a753d4f215c4547f0428
Merge "remove not needed return and break"