Adding option to not run exit command.