Removed EXIT statements