diff -r d251c7b2de54 -r 2a33304714ba branchitem.cpp
--- a/branchitem.cpp	Thu Oct 01 11:28:50 2009 +0000
+++ b/branchitem.cpp	Tue Nov 17 08:24:59 2009 +0000
@@ -368,7 +368,10 @@
 
 BranchItem* BranchItem::getLastSelectedBranch()
 {
-	return getBranchNum (lastSelectedBranchNum);
+	if (lastSelectedBranchNum>=branchCounter)
+		return getBranchNum (branchCounter-1);
+	else	
+		return getBranchNum (lastSelectedBranchNum);
 }
 
 BranchItem* BranchItem::getLastSelectedBranchAlt()