Fix NPE #32