Fixed channel checking to not break when None set