Die gracefully logic changed