Safe exit (22/25)

Safe exit