2 NPE fix