Prevented NPE's