Safe exit

RAP-Innovate-2021-23