BC-2369 #resolve. fixed for NPE