Safe exit (24/25)

Safe exit