diff --git a/src/GitHub.Api/Git/GitClient.cs b/src/GitHub.Api/Git/GitClient.cs
index faca75d12..12d9bf78b 100644
--- a/src/GitHub.Api/Git/GitClient.cs
+++ b/src/GitHub.Api/Git/GitClient.cs
@@ -15,7 +15,7 @@ public interface IGitClient
 
         ITask LfsInstall(IOutputProcessor<string> processor = null);
 
-        ITask<GitStatus?> Status(IOutputProcessor<GitStatus?> processor = null);
+        ITask<GitStatus> Status(IOutputProcessor<GitStatus> processor = null);
 
         ITask<string> GetConfig(string key, GitConfigSource configSource,
             IOutputProcessor<string> processor = null);
@@ -207,7 +207,7 @@ public ITask LfsInstall(IOutputProcessor<string> processor = null)
                 .Configure(processManager);
         }
 
-        public ITask<GitStatus?> Status(IOutputProcessor<GitStatus?> processor = null)
+        public ITask<GitStatus> Status(IOutputProcessor<GitStatus> processor = null)
         {
             Logger.Trace("Status");
 
diff --git a/src/GitHub.Api/Git/RepositoryManager.cs b/src/GitHub.Api/Git/RepositoryManager.cs
index 7a4e20426..e241459a3 100644
--- a/src/GitHub.Api/Git/RepositoryManager.cs
+++ b/src/GitHub.Api/Git/RepositoryManager.cs
@@ -397,10 +397,10 @@ private void UpdateGitStatus()
             var task = GitClient.Status()
                 .Finally((success, ex, data) =>
                 {
-                    Logger.Trace($"GitStatus update: {success} {(data.HasValue ? data.Value.ToString() : "[null]")}");
-                    if (success && data.HasValue)
+                    Logger.Trace($"GitStatus update: {success} {data}");
+                    if (success)
                     {
-                        OnStatusUpdated?.Invoke(data.Value);
+                        OnStatusUpdated?.Invoke(data);
                         Logger.Trace("Updated Git Status");
                     }
                 });
diff --git a/src/GitHub.Api/Git/Tasks/GitStatusTask.cs b/src/GitHub.Api/Git/Tasks/GitStatusTask.cs
index e8ee0bf8f..da66e2c98 100644
--- a/src/GitHub.Api/Git/Tasks/GitStatusTask.cs
+++ b/src/GitHub.Api/Git/Tasks/GitStatusTask.cs
@@ -2,12 +2,12 @@
 
 namespace GitHub.Unity
 {
-    class GitStatusTask : ProcessTask<GitStatus?>
+    class GitStatusTask : ProcessTask<GitStatus>
     {
         private const string TaskName = "git status";
 
         public GitStatusTask(IGitObjectFactory gitObjectFactory,
-            CancellationToken token, IOutputProcessor<GitStatus?> processor = null)
+            CancellationToken token, IOutputProcessor<GitStatus> processor = null)
             : base(token, processor ?? new StatusOutputProcessor(gitObjectFactory))
         {
             Name = TaskName;
diff --git a/src/GitHub.Api/OutputProcessors/StatusOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/StatusOutputProcessor.cs
index a2629893f..1b95daca4 100644
--- a/src/GitHub.Api/OutputProcessors/StatusOutputProcessor.cs
+++ b/src/GitHub.Api/OutputProcessors/StatusOutputProcessor.cs
@@ -5,7 +5,7 @@
 
 namespace GitHub.Unity
 {
-    class StatusOutputProcessor : BaseOutputProcessor<GitStatus?>
+    class StatusOutputProcessor : BaseOutputProcessor<GitStatus>
     {
         private static readonly Regex branchTrackedAndDelta = new Regex(@"(.*)\.\.\.(.*)\s\[(.*)\]",
             RegexOptions.Compiled);
diff --git a/src/tests/IntegrationTests/ProcessManagerExtensions.cs b/src/tests/IntegrationTests/ProcessManagerExtensions.cs
index 0ddfc0e68..281b5002d 100644
--- a/src/tests/IntegrationTests/ProcessManagerExtensions.cs
+++ b/src/tests/IntegrationTests/ProcessManagerExtensions.cs
@@ -44,7 +44,7 @@ public static ITask<List<GitLogEntry>> GetGitLogEntries(this IProcessManager pro
                 .Configure(processManager, path, logNameStatus, workingDirectory, false);
         }
 
-        public static ITask<GitStatus?> GetGitStatus(this IProcessManager processManager,
+        public static ITask<GitStatus> GetGitStatus(this IProcessManager processManager,
             NPath workingDirectory,
             IEnvironment environment, IProcessEnvironment gitEnvironment,
             NPath gitPath = null)
@@ -54,7 +54,7 @@ public static ITask<List<GitLogEntry>> GetGitLogEntries(this IProcessManager pro
 
             NPath path = gitPath ?? defaultGitPath;
 
-            return new ProcessTask<GitStatus?>(CancellationToken.None, processor)
+            return new ProcessTask<GitStatus>(CancellationToken.None, processor)
                 .Configure(processManager, path, "status -b -u --porcelain", workingDirectory, false);
         }
 
diff --git a/src/tests/TestUtils/Substitutes/CreateRepositoryProcessRunnerOptions.cs b/src/tests/TestUtils/Substitutes/CreateRepositoryProcessRunnerOptions.cs
index 0d60f4cd0..7b0d8e91f 100644
--- a/src/tests/TestUtils/Substitutes/CreateRepositoryProcessRunnerOptions.cs
+++ b/src/tests/TestUtils/Substitutes/CreateRepositoryProcessRunnerOptions.cs
@@ -7,12 +7,12 @@ class CreateRepositoryProcessRunnerOptions
     {
         public Dictionary<GitConfigGetKey, string> GitConfigGetResults { get; set; }
 
-        public GitStatus? GitStatusResults { get; set; }
+        public GitStatus GitStatusResults { get; set; }
 
         public List<GitLock> GitListLocksResults { get; set; }
 
         public CreateRepositoryProcessRunnerOptions(Dictionary<GitConfigGetKey, string> getConfigResults = null,
-            GitStatus? gitStatusResults = null,
+            GitStatus gitStatusResults = new GitStatus(),
             List<GitLock> gitListLocksResults = null)
         {
             GitListLocksResults = gitListLocksResults;
diff --git a/src/tests/TestUtils/Substitutes/SubstituteFactory.cs b/src/tests/TestUtils/Substitutes/SubstituteFactory.cs
index be5929f17..49b82fc1f 100644
--- a/src/tests/TestUtils/Substitutes/SubstituteFactory.cs
+++ b/src/tests/TestUtils/Substitutes/SubstituteFactory.cs
@@ -411,13 +411,12 @@ public IGitClient CreateRepositoryProcessRunner(
                 });
 
             gitClient.Status().Returns(info => {
-                GitStatus? result = options.GitStatusResults;
-
-                var ret = new FuncTask<GitStatus?>(CancellationToken.None, _ => result);
+                var result = options.GitStatusResults;
+                var ret = new FuncTask<GitStatus>(CancellationToken.None, _ => result);
 
                 logger.Trace(@"RunGitStatus() -> {0}",
-                    result != null ? $"Success: \"{result.Value}\"" : "Failure");
-                var task = Args.GitStatusTask;
+                    $"Success: \"{result}\"");
+                
                 return ret;
             });
 
diff --git a/src/tests/UnitTests/ProcessManagerExtensions.cs b/src/tests/UnitTests/ProcessManagerExtensions.cs
index 6833ec273..5a0820b8a 100644
--- a/src/tests/UnitTests/ProcessManagerExtensions.cs
+++ b/src/tests/UnitTests/ProcessManagerExtensions.cs
@@ -62,12 +62,12 @@ public static async Task<GitStatus> GetGitStatus(this ProcessManager processMana
 
             NPath path = gitPath ?? defaultGitPath;
 
-            var results = await new ProcessTask<GitStatus?>(CancellationToken.None, processor)
+            var results = await new ProcessTask<GitStatus>(CancellationToken.None, processor)
                 .Configure(processManager, path, "status -b -u --porcelain", workingDirectory, false)
                 .Start()
                 .Task;
 
-            return results.Value;
+            return results;
         }
  
         public static async Task<List<GitRemote>> GetGitRemoteEntries(this ProcessManager processManager,