Adding channel value checking per suggestion