Some more logging and only kill channel when actually running.