diff --git a/src/GitVersionCore/GitRepoMetadataProvider.cs b/src/GitVersionCore/GitRepoMetadataProvider.cs
index 4b7c8dd914..8ba5c00a0b 100644
--- a/src/GitVersionCore/GitRepoMetadataProvider.cs
+++ b/src/GitVersionCore/GitRepoMetadataProvider.cs
@@ -147,8 +147,14 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
                             var second = forwardMerge.Parents.First();
                             Logger.WriteDebug("Second " + second.Sha);
                             var mergeBase = Repository.ObjectDatabase.FindMergeBase(commit, second);
-                            Logger.WriteDebug("New Merge base " + mergeBase.Sha);
-
+                            if (mergeBase == null)
+                            {
+                                Logger.WriteWarning("Could not find mergbase for " + commit);
+                            }
+                            else
+                            {
+                                Logger.WriteDebug("New Merge base " + mergeBase.Sha);
+                            }
                             if (mergeBase == findMergeBase)
                             {
                                 Logger.WriteDebug("Breaking");