Fixed #find_or_create_channel not returning a channel

This was caused by the fact that `if` statements apparently
change the implicit return value, even if the condition wasn't
met.