NPE fixed. #142