Changed channel handling to aviod NPE