Removing the premature exit