diff --git a/src/dsdhacked.c b/src/dsdhacked.c
index c6309705..e6eb1558 100644
--- a/src/dsdhacked.c
+++ b/src/dsdhacked.c
@@ -280,6 +280,7 @@ void dsdh_EnsureSFXCapacity(int limit)
       S_sfx[i].priority = 127;
       S_sfx[i].pitch = -1;
       S_sfx[i].volume = -1;
+      S_sfx[i].lumpnum = -1;
     }
   }
 }
diff --git a/src/r_things.c b/src/r_things.c
index 2d5185ae..e460cf2a 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -191,7 +191,12 @@ void R_InitSpriteDefs(char **namelist)
   for (i=0 ; i<num_sprites ; i++)
     {
       const char *spritename = namelist[i];
-      int j = hash[R_SpriteNameHash(spritename) % numentries].index;
+      int j;
+
+      if (!spritename)
+        break;
+
+      j = hash[R_SpriteNameHash(spritename) % numentries].index;
 
       if (j >= 0)
         {