Drain collector channel when returning prematurely.

Change-Id: I565ec26932365f9c559f0a808c5cf58aaeab45e7