Fix NPE #96