STORM-297: avoid duplicate Channel Null Check