npe fixed. close #48
alarm commit
possible solution
NPE fixed