diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 0518395965..b0aa6b17d6 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -1010,11 +1010,18 @@ ExportDialog::do_export ()
   	progress_connection.disconnect ();
 	end_dialog ();
 
-	NagScreen* ns = NagScreen::maybe_nag (_("export"));
+	/* if not stopped early and not SAE, ask for money, maybe */
 
-	if (ns) {
-		ns->nag ();
-		delete ns;
+	cerr << "At end, spec.stop == " << spec.stop << endl;
+
+	if (!spec.stop && !Profile->get_sae()) {
+
+		NagScreen* ns = NagScreen::maybe_nag (_("export"));
+		
+		if (ns) {
+			ns->nag ();
+			delete ns;
+		}
 	}
 }
 	
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 1c1589695a..d9738e9dc0 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -228,7 +228,6 @@ fixup_bundle_environment ()
 	path += "/../Resources/gdk-pixbuf.loaders";
 
 	setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1);
-	cerr << "Set GDK_PIXBUF_MODULE_FILE to " << path << endl;
 
 	if (getenv ("ARDOUR_WITH_JACK")) {
 		// JACK driver dir
diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 76ae44f1ba..53e63fd338 100644
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -453,10 +453,21 @@ Session::stop_audio_export (AudioExportSpecification& spec)
 {
 	/* don't stop freewheeling but do stop paying attention to it for now */
 
+
+	/* save the value of stop so that the UI
+	   can see if it requested a stop.
+	*/
+
+	bool old_stop = spec.stop;
+
 	spec.freewheel_connection.disconnect ();
 	spec.clear (); /* resets running/stop etc */
 
-	Exported (spec.path, name());
+	spec.stop = old_stop;
+
+	if (!spec.stop) {
+		Exported (spec.path, name());
+	}
 
 	return 0;
 }