Fix anover possible NPE