Merge pull request #431 from y-higuchi/fix_findbug_issues

Fix findbug issues