diff --git a/src/s_playlist.cpp b/src/s_playlist.cpp
index e92a5ceea5..e7170eaa80 100644
--- a/src/s_playlist.cpp
+++ b/src/s_playlist.cpp
@@ -122,7 +122,12 @@ bool FPlayList::ChangeList (const char *path)
 			// Path is relative; append it to the playlist directory.
 			song = playlistdir + song;
 		}
-		Songs.Push(song);
+
+		// Just to make sure
+		if (song.IsNotEmpty())
+		{
+			Songs.Push(song);
+		}
 	}
 	fclose (file);
 
diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index f31f1c2da4..db0f0f21dd 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -2327,7 +2327,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
 		// Don't choke if the map doesn't have a song attached
 		S_StopMusic (true);
 		mus_playing.name = "";
-		return false;
+		return true;
 	}
 
 	FString DEH_Music;