diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index a384f2fcb..3ca3b1be3 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -1517,15 +1517,17 @@ void Main::on_create_triggered()
 
 void Main::on_debugStep_triggered()
 {
-	auto l = m_history[ui->debugTimeline->value()].levels.size();
-	if ((ui->debugTimeline->value() + 1) < m_history.size() && m_history[ui->debugTimeline->value() + 1].levels.size() > l)
-	{
-		on_debugStepInto_triggered();
-		if (m_history[ui->debugTimeline->value()].levels.size() > l)
-			on_debugStepOut_triggered();
+	if (ui->debugTimeline->value() < m_history.size()) {
+		auto l = m_history[ui->debugTimeline->value()].levels.size();
+		if ((ui->debugTimeline->value() + 1) < m_history.size() && m_history[ui->debugTimeline->value() + 1].levels.size() > l)
+		{
+			on_debugStepInto_triggered();
+			if (m_history[ui->debugTimeline->value()].levels.size() > l)
+				on_debugStepOut_triggered();
+		}
+		else
+			on_debugStepInto_triggered();
 	}
-	else
-		on_debugStepInto_triggered();
 }
 
 void Main::on_debugStepInto_triggered()
diff --git a/libserpent/parser.cpp b/libserpent/parser.cpp
index 38fdca6ed..497bdb526 100644
--- a/libserpent/parser.cpp
+++ b/libserpent/parser.cpp
@@ -150,10 +150,10 @@ Node treefy(std::vector<Node> stream) {
         else if (typ == RPAREN) {
             std::vector<Node> args;
             while (1) {
+                if (!oq.size()) err("Bracket without matching", tok.metadata);
                 if (toktype(oq.back()) == LPAREN) break;
                 args.push_back(oq.back());
                 oq.pop_back();
-                if (!oq.size()) err("Bracket without matching", tok.metadata);
             }
             oq.pop_back();
             args.push_back(oq.back());