Safe exit (10/25)

Safe exit