diff --git a/Frameworks/GME/gme/Vgm_Emu.cpp b/Frameworks/GME/gme/Vgm_Emu.cpp
index e8350fb78..b81e9ede5 100644
--- a/Frameworks/GME/gme/Vgm_Emu.cpp
+++ b/Frameworks/GME/gme/Vgm_Emu.cpp
@@ -29,13 +29,14 @@ Vgm_Emu::Vgm_Emu()
 	set_type( gme_vgm_type );
 	set_max_initial_silence( 1 );
 	set_silence_lookahead( 1 ); // tracks should already be trimmed
+	voice_names_assigned_ = false;
 }
 
 Vgm_Emu::~Vgm_Emu()
 {
     // XXX ugly use of deprecated functions to free allocated voice names
     const char ** voice_names_ = voice_names();
-    if (voice_names_)
+    if (voice_names_assigned_ && voice_names_)
     {
         for (int i = 0; i < 32; ++i)
         {
@@ -512,7 +513,10 @@ blargg_err_t Vgm_Emu::load_mem_( const byte* in, int file_size )
                 break;
         }
         if (i == voice_count)
+        {
             set_voice_names(voice_names);
+            voice_names_assigned_ = true;
+        }
         else
         {
             for (i = 0; i < voice_count; i++)
diff --git a/Frameworks/GME/gme/Vgm_Emu.h b/Frameworks/GME/gme/Vgm_Emu.h
index 777fce533..201f133fe 100644
--- a/Frameworks/GME/gme/Vgm_Emu.h
+++ b/Frameworks/GME/gme/Vgm_Emu.h
@@ -54,6 +54,8 @@ private:
     blargg_vector<byte> data;
     track_info_t metadata;
     track_info_t metadata_j;
+    
+    bool voice_names_assigned_;
 	
 	void check_end();
 };