diff --git a/source/simulation/scripting/SimulationScriptInit.cpp b/source/simulation/scripting/SimulationScriptInit.cpp
index 5608c53a08..ca2b2a94c9 100644
--- a/source/simulation/scripting/SimulationScriptInit.cpp
+++ b/source/simulation/scripting/SimulationScriptInit.cpp
@@ -3,12 +3,17 @@
 #include "lib/timer.h"
 #include "simulation/Scheduler.h"
 #include "simulation/EntityTemplate.h"
+#include "simulation/EntityTemplateCollection.h"
 #include "simulation/Entity.h"
 #include "simulation/Projectile.h"
+#include "simulation/EventHandlers.h"
 #include "simulation/TriggerManager.h"
 #include "simulation/FormationManager.h"
+#include "simulation/FormationCollection.h"
 #include "simulation/ProductionQueue.h"
 #include "simulation/Technology.h"
+#include "simulation/TechnologyCollection.h"
+#include "simulation/PathfindEngine.h"
 
 void SimulationScriptInit()
 {
diff --git a/source/sound/SoundGroup.cpp b/source/sound/SoundGroup.cpp
index 1ceba49a13..cd6416c887 100644
--- a/source/sound/SoundGroup.cpp
+++ b/source/sound/SoundGroup.cpp
@@ -55,6 +55,8 @@ void CSoundGroup::PlayNext()
 		{
 			// load up replacement file
 			m_hReplacement = snd_open(m_filepath + m_intensity_file);
+			if(m_hReplacement == ERR::AGAIN)	// sound is disabled
+				return;
 			snd_set_gain(m_hReplacement, m_Gain);	
 			snd_set_pitch(m_hReplacement, m_Pitch);
 			snd_set_cone(m_hReplacement, m_ConeInnerAngle, m_ConeOuterAngle, m_ConeOuterGain);
@@ -80,6 +82,8 @@ void CSoundGroup::PlayNext()
 			m_index = (size_t)rand(0, (size_t)filenames.size());
 		Handle temp;
 		temp = snd_open(m_filepath + filenames[m_index]);
+		if(temp == ERR::AGAIN)	// sound is disabled
+			return;
 		snd_set_gain(temp, m_Gain);	
 		snd_set_pitch(temp, m_Pitch);
 		snd_set_cone(temp, m_ConeInnerAngle, m_ConeOuterAngle, m_ConeOuterGain);