From c50c88d071a6e4695fa2248c8e37665300437622 Mon Sep 17 00:00:00 2001
From: Ben Payne <bpayne@beamng.com>
Date: Tue, 11 Nov 2014 15:14:47 -0500
Subject: [PATCH] Fix use-after-delete errors

---
 Engine/source/T3D/shapeImage.cpp           | 4 ++--
 Engine/source/ts/collada/colladaLights.cpp | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp
index 548984ca8..9a31a87c9 100644
--- a/Engine/source/T3D/shapeImage.cpp
+++ b/Engine/source/T3D/shapeImage.cpp
@@ -3339,6 +3339,6 @@ void ShapeBase::ejectShellCasing( U32 imageSlot )
 
    if (!casing->registerObject())
       delete casing;
-
-   casing->init( shellPos, shellVel );
+   else
+      casing->init( shellPos, shellVel );
 }
diff --git a/Engine/source/ts/collada/colladaLights.cpp b/Engine/source/ts/collada/colladaLights.cpp
index b906ecd03..a1d22cd84 100644
--- a/Engine/source/ts/collada/colladaLights.cpp
+++ b/Engine/source/ts/collada/colladaLights.cpp
@@ -128,8 +128,7 @@ static void processNodeLights(AppNode* appNode, const MatrixF& offset, SimGroup*
          Con::errorf(ConsoleLogEntry::General, "Failed to register light for \"%s\"", lightName.c_str());
          delete pLight;
       }
-
-      if (group)
+      else if (group)
          group->addObject(pLight);
    }