Safe exit (23/25)

Safe exit