Should check exc_type not exc_value to determine if exception occurred.
Merge remote-tracking branch 'src/master'
django-1.6 transition