Fix NPE #61