diff --git a/pass/Models/PasswordStore.swift b/pass/Models/PasswordStore.swift
index 1da7e0b..44641a4 100644
--- a/pass/Models/PasswordStore.swift
+++ b/pass/Models/PasswordStore.swift
@@ -755,6 +755,11 @@ class PasswordStore {
         }
         let remoteMasterBranch = try storeRepository.remoteBranches()[index]
         
+        // check oid before calling localCommitsRelative
+        guard remoteMasterBranch.oid != nil else {
+            throw AppError.RepositoryRemoteMasterNotFoundError
+        }
+        
         // get a list of local commits
         return try storeRepository.localCommitsRelative(toRemoteBranch: remoteMasterBranch)
     }