KHRES-431 #comment fix NPE