added possible NPE fix