diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 8d831ee40d..b607a43dbd 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -759,7 +759,7 @@ Session::process_without_events (nframes_t nframes)
 	}
 		
 	if (maybe_stop (stop_limit)) {
-		fail_roll (nframes);
+		no_roll (nframes);
 		return;
 	} 
 
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 73d8ba2921..f8e12e07b8 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1359,10 +1359,12 @@ Session::load_routes (const XMLNode& node)
 	set_dirty();
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		if ((*niter)->property ("default-type")->value() == "unknown" ) {
-		  std::cout << "ignoring route with type unknown. (video-track)" << std::endl;
-		  // Note: this may mess up remote_control IDs or more..
-		  continue;
+		XMLProperty* prop = (*niter)->property ("default-type");
+		
+		if (prop && prop->value() == "unknown" ) {
+			std::cout << "ignoring route with type unknown. (video-track)" << std::endl;
+			// Note: this may mess up remote_control IDs or more..
+			continue;
 		}
 
 		boost::shared_ptr<Route> route (XMLRouteFactory (**niter));