Merge tag 'v20140603' into develop

v20140603
add log to track exit exception
add logs
add error event callback
add try/catch around emit
Merge branch 'release/v20140610'