Safe exit (4/25)

Safe exit