1 files changed, 9 insertions, 3 deletions
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 5b1bba1f3c..3e9cd41698 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -1140,9 +1140,15 @@ Selection::set_state (XMLNode const & node, int)
 			assert (rtv);
 			
 			boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ()));
-			assert (atv);
-			
-			add (atv.get());
+                        
+                        /* the automation could be for an entity that was never saved
+                           in the session file. Don't freak out if we can't find
+                           it.
+                        */
+
+                        if (atv) {
+                                add (atv.get());
+                        }
 		}
 	}