#516 예외처리
Merge branch '#516_bugFix' into dev