2nd NPE fix