Fix NPE 2