Fixed; NPE
Merge pull request #12 from esmasui/fix_npe

Fixed; NPE