Merge pull request #438 from y-higuchi/bug_fix

Bug fix to avoid Null Pointer Exception.