Fix possible NPE #4850