Add push and pop exception handlers