diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index 8a9dccd1bc4..3f9776dc570 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -198,7 +198,8 @@
 
 	prefs.sound ^= SOUND_STREAMING
 	prefs.save_preferences(src)
-	usr << "You will [(prefs.toggles & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media."
+	usr << "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media."
 	// Restart.
-	media.stop_music()
-	media.update_music()
+	if(media)
+		media.stop_music()
+		media.update_music()
diff --git a/code/setup.dm b/code/setup.dm
index bedcd606ed0..f99614b69f0 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -689,7 +689,7 @@ var/list/TAGGERLOCATIONS = list("Disposals",
 #define SOUND_MIDI		2
 #define SOUND_AMBIENCE	4
 #define SOUND_LOBBY		8
-#define SOUND_STREAMING 16
+#define SOUND_STREAMING	16
 
 #define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_STREAMING)
 #define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC)