Added some event exception logic.  Closes #1099