remove possible NPE