Add fail handler and notification