Add if block not to occur NPexception.
Merge branch 'master' of github.com:St-Arai/ExperimentTest