1 files changed, 9 insertions, 6 deletions

diff --git a/src/World.cpp b/src/World.cpp
index c9199b6ba..4c57b283f 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -273,12 +273,12 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin
 
 cWorld::~cWorld()
 {
-	delete m_SimulatorManager;
-	delete m_SandSimulator;
-	delete m_WaterSimulator;
-	delete m_LavaSimulator;
-	delete m_FireSimulator;
-	delete m_RedstoneSimulator;
+	delete m_SimulatorManager;   m_SimulatorManager  = NULL;
+	delete m_SandSimulator;      m_SandSimulator     = NULL;
+	delete m_WaterSimulator;     m_WaterSimulator    = NULL;
+	delete m_LavaSimulator;      m_LavaSimulator     = NULL;
+	delete m_FireSimulator;      m_FireSimulator     = NULL;
+	delete m_RedstoneSimulator;  m_RedstoneSimulator = NULL;
 
 	UnloadUnusedChunks();
 	
@@ -3036,11 +3036,13 @@ int cWorld::SpawnMobFinalize(cMonster * a_Monster)
 	if (cPluginManager::Get()->CallHookSpawningMonster(*this, *a_Monster))
 	{
 		delete a_Monster;
+		a_Monster = NULL;
 		return -1;
 	}
 	if (!a_Monster->Initialize(*this))
 	{
 		delete a_Monster;
+		a_Monster = NULL;
 		return -1;
 	}
 	BroadcastSpawnEntity(*a_Monster);
@@ -3063,6 +3065,7 @@ int cWorld::CreateProjectile(double a_PosX, double a_PosY, double a_PosZ, cProje
 	if (!Projectile->Initialize(*this))
 	{
 		delete Projectile;
+		Projectile = NULL;
 		return -1;
 	}
 	return Projectile->GetUniqueID();