modified exception handler
add log for exception
Merge branch 'develop'