Fix exception listener