Fix Issue 5 : SavedFailedEvent is never fired