NPE fixed. #62