Removed possible NPE