Added back safe successful exits