add gracefull exit on activate