Add exception handler when running callback functions
Merge branch 'develop'