pass exception to 500 event correctly.
Merge remote-tracking branch 'origin/master'