diff --git a/engine/code/snd_fmod.c b/engine/code/snd_fmod.c
index fc8dbf5..5d0d503 100644
--- a/engine/code/snd_fmod.c
+++ b/engine/code/snd_fmod.c
@@ -160,13 +160,10 @@ void FMOD_ERROR(FMOD_RESULT result, qboolean notify, qboolean syserror)
 {
 	if (result != FMOD_OK)
 	{
-		if (syserror == false)
-		{
-			if (notify == true)
-				Con_Printf("%s\n", FMOD_ErrorString(result));
-		}
-		else
+		if (syserror)
 			Sys_Error("FMOD: %s\n", FMOD_ErrorString(result));
+		else if (notify)
+			Con_Printf("%s\n", FMOD_ErrorString(result));
 	}
 }
 
@@ -291,14 +288,7 @@ void FMOD_Startup (void)
 	SND_Initialised = true;
 
 	// clear music channel
-	SND_MusicChannel.volume = 0.0f;
-	SND_MusicChannel.channel = NULL;
-	SND_MusicChannel.track = 0;
-	strcpy(SND_MusicChannel.trackname, "\0");
-	SND_MusicChannel.inuse = false;
-	SND_MusicChannel.looping = false;
-	SND_MusicChannel.loopcount = 0;
-	SND_MusicChannel.paused = false;
+	memset(&SND_MusicChannel, 0, sizeof(SND_Channel_t));
 }
 
 /*
@@ -330,14 +320,7 @@ void FMOD_Shutdown(void)
 	SND_Initialised = false;
 
 	// clear music channel
-	SND_MusicChannel.volume = 0.0f;
-	SND_MusicChannel.channel = NULL;
-	SND_MusicChannel.track = 0;
-	strcpy(SND_MusicChannel.trackname, "\0");
-	SND_MusicChannel.inuse = false;
-	SND_MusicChannel.looping = false;
-	SND_MusicChannel.loopcount = 0;
-	SND_MusicChannel.paused = false;
+	memset(&SND_MusicChannel, 0, sizeof(SND_Channel_t));
 }
 
 /*