Made the checks more explicit for channel handling