Merge "Protect against null channel"