diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index af2e8d1da2..8b6dfb2565 100644
--- a/gtk2_ardour/port_group.cc
+++ b/gtk2_ardour/port_group.cc
@@ -459,7 +459,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 		if (!inputs) {
 
 			program->add_bundle (session->the_auditioner()->output()->bundle());
-			program->add_bundle (session->click_io()->bundle());
+			if (session->click_io()) {
+				program->add_bundle (session->click_io()->bundle());
+			}
 
 			boost::shared_ptr<Bundle> ltc (new Bundle (_("LTC Out"), inputs));
 			ltc->add_channel (_("LTC Out"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_output_port()->name()));
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 52060e0244..65b594fa71 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -6969,7 +6969,9 @@ Session::set_worst_output_latency ()
 		_io_latency = max (_io_latency, (*i)->output()->latency() + (*i)->input()->latency());
 	}
 
-	_worst_output_latency = max (_worst_output_latency, _click_io->latency());
+	if (_click_io) {
+		_worst_output_latency = max (_worst_output_latency, _click_io->latency());
+	}
 
 	DEBUG_TRACE (DEBUG::LatencyCompensation, string_compose ("Worst output latency: %1\n", _worst_output_latency));
 }