fix null exception - hyewon.eum
Merge branch 'master' of https://github.com/criseyes/crescendo