exception handler improvement + result and exception display
Merge remote-tracking branch 'origin/master'