proper NPE fix