add null check
Merge branch 'master' of github.com:St-Arai/Experiment1-3