Don't change the channel if the new channel is nil
Merge pull request #14 from cheapie/master

Fix #13