Fix NPE #37