Minor updates to catch NULL channels.

Source:

[982ebf9d31]