Added proper error checking in event callback handler
2 files changed