- Fix NPE