From a8be273479ed6177b7aef0dae2f75238b6de4640 Mon Sep 17 00:00:00 2001
From: Applevangelist <post@tniedermeier.com>
Date: Tue, 13 Jun 2023 18:01:13 +0200
Subject: [PATCH] FIXES

---
 Moose Development/Moose/Core/Spawn.lua   | 6 +++++-
 Moose Development/Moose/Wrapper/Unit.lua | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua
index 894f43a36..b1370313f 100644
--- a/Moose Development/Moose/Core/Spawn.lua	
+++ b/Moose Development/Moose/Core/Spawn.lua	
@@ -3127,7 +3127,11 @@ function SPAWN:_GetTemplate( SpawnTemplatePrefix )
   self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnTemplatePrefix } )
 
   local SpawnTemplate = nil
-
+  
+  if _DATABASE.Templates.Groups[SpawnTemplatePrefix] == nil then
+    error( 'No Template exists for SpawnTemplatePrefix = ' .. SpawnTemplatePrefix )
+  end
+  
   local Template = _DATABASE.Templates.Groups[SpawnTemplatePrefix].Template
   self:F( { Template = Template } )
 
diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua
index e271ce1a0..11b363bca 100644
--- a/Moose Development/Moose/Wrapper/Unit.lua	
+++ b/Moose Development/Moose/Wrapper/Unit.lua	
@@ -179,9 +179,9 @@ function UNIT:GetDCSObject()
     return DCSUnit
   end
   
-  if self.DCSUnit then
-    return self.DCSUnit
-  end
+  --if self.DCSUnit then
+    --return self.DCSUnit
+  --end
   
   return nil
 end