Remove a potential NPE