diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index 4258267919..83219fcfc5 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -1024,7 +1024,7 @@ void S_StopSound (fixed_t *pt, int channel)
 void S_StopSound (AActor *ent, int channel)
 {
 	// No need to search every channel if we know it's not playing anything.
-	if (ent->SoundChans & (1 << channel))
+	if (ent != NULL && ent->SoundChans & (1 << channel))
 	{
 		S_StopSound (&ent->x, channel);
 	}
diff --git a/wadsrc/Makefile.mgw b/wadsrc/Makefile.mgw
index 8616de83df..523efbd378 100644
--- a/wadsrc/Makefile.mgw
+++ b/wadsrc/Makefile.mgw
@@ -1,5 +1,4 @@
 MAKEWAD=../tools/makewad/makewad
-XLATCC=../tools/xlatcc/xlatcc
 DEHSUPP=../tools/dehsupp/dehsupp
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -9,14 +8,14 @@ ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 export OSTYPE=msys
 endif
 
-wadmake: zdoom.lst $(MAKEWAD).exe $(XLATCC).exe $(DEHSUPP).exe
+wadmake: zdoom.lst $(MAKEWAD).exe $(DEHSUPP).exe
 	$(MAKEWAD) -make wadmake zdoom.lst
 
 clean:
 ifeq ($(OSTYPE),msys)
-	rm -f wadmake zdoom.pk3 xlat/*.x dehsupp.lmp
+	rm -f wadmake zdoom.pk3 dehsupp.lmp
 else
-	del /q /f wadmake zdoom.pk3 xlat\*.x dehsupp.lmp 2>nul
+	del /q /f wadmake zdoom.pk3 dehsupp.lmp 2>nul
 endif
 
 ../tools/makewad/makewad.exe: