diff --git a/GitTfs/Core/TfsChangeset.cs b/GitTfs/Core/TfsChangeset.cs
index c8cc63ad..31dc0eb2 100644
--- a/GitTfs/Core/TfsChangeset.cs
+++ b/GitTfs/Core/TfsChangeset.cs
@@ -193,11 +193,11 @@ namespace Sep.Git.Tfs.Core
         }
 
         private LogEntry MakeNewLogEntry(IChangeset changesetToLog)
-        {
+        {
             var log = new LogEntry();
-            var identity = tfs.GetIdentity(changesetToLog.Committer);
-            log.CommitterName = log.AuthorName = identity.DisplayName ?? "Unknown TFS user";
-            log.CommitterEmail = log.AuthorEmail = identity.MailAddress ?? changesetToLog.Committer;
+            var identity = tfs.GetIdentity(changesetToLog.Committer);
+            log.CommitterName = log.AuthorName = null != identity ? identity.DisplayName ?? "Unknown TFS user" : changesetToLog.Committer ?? "Unknown TFS user";
+            log.CommitterEmail = log.AuthorEmail = null != identity ? identity.MailAddress ?? changesetToLog.Committer : changesetToLog.Committer;
             log.Date = changesetToLog.CreationDate;
             log.Log = changesetToLog.Comment + Environment.NewLine;
             log.ChangesetId = changesetToLog.ChangesetId;