am 5346907d: Fix control channel shutdown in case of errors.

* commit '5346907dd4fb99c8e1ad19690270f0ae8567aade':
  Fix control channel shutdown in case of errors.