This is not caught in the event system, so this causes major issues

Revert "The exception is properly caught inthe event system now"

This reverts commit 4502019340a602c90b7b3790c0a1f33f6e0d15a1.
Merge pull request #16343 from jacksontj/2014.7

This is not caught in the event system, so this causes major issues