Fix NPE pt. 2