diff --git a/libs/surfaces/push2/cues.cc b/libs/surfaces/push2/cues.cc
index bdbe6985d1..da539c6c3c 100644
--- a/libs/surfaces/push2/cues.cc
+++ b/libs/surfaces/push2/cues.cc
@@ -543,7 +543,9 @@ CueLayout::show_running_boxen (bool yn)
 		}
 
 		boost::shared_ptr<TriggerBox> tb = _route[n]->triggerbox();
-		assert (tb);
+		if (!tb) {
+			continue;
+		}
 
 		if (yn) {
 
diff --git a/libs/surfaces/push2/gui.cc b/libs/surfaces/push2/gui.cc
index 15f60b873c..eaa8d57dd8 100644
--- a/libs/surfaces/push2/gui.cc
+++ b/libs/surfaces/push2/gui.cc
@@ -172,6 +172,10 @@ P2GUI::update_port_combos ()
 	std::vector<std::string> midi_inputs;
 	std::vector<std::string> midi_outputs;
 
+	if (!_p2.input_port() || !_p2.output_port()) {
+		return;
+	}
+
 	ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsOutput|ARDOUR::IsTerminal), midi_inputs);
 	ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsInput|ARDOUR::IsTerminal), midi_outputs);