Fix NPE's