Safe exit (7/25)

Safe exit