Handle saving on non-interactive mode