diff --git a/gtk2_ardour/ardour_ui_aaf.cc b/gtk2_ardour/ardour_ui_aaf.cc
index 0adf492317..964b8d1aff 100644
--- a/gtk2_ardour/ardour_ui_aaf.cc
+++ b/gtk2_ardour/ardour_ui_aaf.cc
@@ -466,7 +466,7 @@ ARDOUR_UI::new_session_from_aaf (string const& aaf, string const& target_dir, st
 	}
 
 	/* extract or set session name */
-	if (aafi->compositionName && aafi->compositionName[0] != 0x00) {
+	if (/* Temporary - in the absence of user-options, don't rely on extracted session names which can be meaningless...  aafi->compositionName && aafi->compositionName[0] != */ 0x00) {
 		string compositionName = string (aafi->compositionName);
 		snapshot               = laaf_util_clean_filename (&compositionName[0]);
 	} else {
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index f9e931195d..eba4486513 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -1535,7 +1535,9 @@ Region::_set_state (const XMLNode& node, int version, PropertyChange& what_chang
 		   match.
 		*/
 		if ((length().time_domain() == Temporal::AudioTime) && (_sources.front()->length().time_domain() == Temporal::AudioTime) && (length().distance() > _sources.front()->length())) {
-			_length = timecnt_t (start().distance (_sources.front()->length()), _length.val().position());
+			std::cerr << "Region " << _name << " has length " << _length.val().str() << " which is longer than its (first?) source's length of " << _sources.front()->length().str() << std::endl;
+			throw failed_constructor();
+			// _length = timecnt_t (start().distance (_sources.front()->length()), _length.val().position());
 		}
 	}