NPE fix