Removed possible NPE's