Early return missing

Change-Id: I0d4f9b14f2a41a3acb08ba1b6c13fdf1174021e7