diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 1b9962744d..3122ff760c 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -1212,19 +1212,10 @@ AudioEngine::connect_to_jack (string client_name)
 	_jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
 
 	if (_jack == NULL) {
-
-		if (status & JackServerFailed) {
-			error << _("Unable to connect to JACK server") << endmsg;
-		}
-		
 		// error message is not useful here
 		return -1;
 	}
 
-	if (status & JackServerStarted) {
-		info << _("JACK server started") << endmsg;
-	}
-
 	if (status & JackNameNotUnique) {
 		jack_client_name = jack_get_client_name (_jack);
 	}
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index ed5aea1c37..3b9b48a2de 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1989,8 +1989,12 @@ Session::add_routes (RouteList& new_routes, bool save)
 			_control_out = (*x);
 		}
 
-		add_bundle ((*x)->bundle_for_inputs());
-		add_bundle ((*x)->bundle_for_outputs());
+		/* only busses get automatic bundles formed */
+
+		if (!boost::dynamic_pointer_cast<Track> (*x)) {
+			add_bundle ((*x)->bundle_for_inputs());
+			add_bundle ((*x)->bundle_for_outputs());
+		}
 	}
 
 	if (_control_out && IO::connecting_legal) {