Safe exit (8/25)

Safe exit