Closes #591, more info about exception handler