Safe exit (6/25)

Safe exit