Fix for possible NPE