Avoid NPE's