diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 4b2f0961d1..5404432c37 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -769,10 +769,11 @@ If you still wish to quit, please use the\n\n\
 		_session = 0;
 	}
 
-	ArdourDialog::close_all_dialogs ();
-	engine->stop (true);
         cerr << "Save before quit\n";
 	save_ardour_state ();
+
+	ArdourDialog::close_all_dialogs ();
+	engine->stop (true);
 	quit ();
 }
 
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 8b52bfaea5..36cc25a315 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -869,12 +869,12 @@ IO::make_connections (const XMLNode& node, int version, bool in)
 					if ((prop = cnode->property (X_("other"))) == 0) {
 						continue;
 					}
-
+                                        
 					if (prop) {
 						p->connect (prop->value());
 					}
 				}
-			}
+			} 
 		}
 	}