diff --git a/appview/repo/repo.go b/appview/repo/repo.go
index e652bbe3..65d1deb8 100644
--- a/appview/repo/repo.go
+++ b/appview/repo/repo.go
@@ -119,7 +119,7 @@ func (rp *Repo) RepoIndex(w http.ResponseWriter, r *http.Request) {
 		if b.IsDefault {
 			return 1
 		}
-		if a.Commit != nil {
+		if a.Commit != nil && b.Commit != nil {
 			if a.Commit.Committer.When.Before(b.Commit.Committer.When) {
 				return 1
 			} else {
@@ -630,7 +630,7 @@ func (rp *Repo) RepoBranches(w http.ResponseWriter, r *http.Request) {
 		if b.IsDefault {
 			return 1
 		}
-		if a.Commit != nil {
+		if a.Commit != nil && b.Commit != nil {
 			if a.Commit.Committer.When.Before(b.Commit.Committer.When) {
 				return 1
 			} else {