CQ-103 Fix for NPE