Added a few cases where program will exit with --no-interaction.