Changed NPE fix