Added extra NPE check