From a707517ea57b03ab7bc0834638cb4e5b4202a27b Mon Sep 17 00:00:00 2001
From: cobbr <ryancobb65@gmail.com>
Date: Sat, 14 Sep 2019 13:38:28 -0500
Subject: [PATCH] Fix null tasking Interact display

---
 CHANGELOG.md                         | 4 ++++
 Covenant/Views/Grunt/Interact.cshtml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6d25008..df70d03a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Fixed
+- Fixed null tasking display
+
 ## [v0.3.2] - 2019-09-11
 ### Added
 - Added PersistAutorun task, PersistStartup task, and PersistWMI task
diff --git a/Covenant/Views/Grunt/Interact.cshtml b/Covenant/Views/Grunt/Interact.cshtml
index 7320a8c7..843f5a94 100644
--- a/Covenant/Views/Grunt/Interact.cshtml
+++ b/Covenant/Views/Grunt/Interact.cshtml
@@ -318,7 +318,7 @@
                                 <div class="card-body">
                                     @if (command.CommandOutput != null)
                                     {
-                                        if (command.GruntTasking.GruntTask.Name == "ScreenShot")
+                                        if (command.GruntTasking != null && command.GruntTasking.GruntTask != null && command.GruntTasking.GruntTask.Name == "ScreenShot")
                                         {
                                             <img style="max-width: 100%" src="data:image/png;base64, @command.CommandOutput.Output" />
                                         }
@@ -800,4 +800,4 @@
                 }
             });
         });</script>
-}
\ No newline at end of file
+}