event exception message attach event code
Merge branches 'online' and 'master'