Fix NPE #33