diff --git a/src/gl/scene/gl_spritelight.cpp b/src/gl/scene/gl_spritelight.cpp
index fa4318535..0eba9249b 100644
--- a/src/gl/scene/gl_spritelight.cpp
+++ b/src/gl/scene/gl_spritelight.cpp
@@ -148,7 +148,7 @@ static bool CheckBBoxCircle(float *bbox, float x, float y, float radiusSquared)
 }
 
 template<typename Callback>
-void BSPNodeWalkCircle(void *node, float x, float y, float radiusSquared, Callback &callback)
+void BSPNodeWalkCircle(void *node, float x, float y, float radiusSquared, const Callback &callback)
 {
 	while (!((size_t)node & 1))
 	{
@@ -168,7 +168,7 @@ void BSPNodeWalkCircle(void *node, float x, float y, float radiusSquared, Callba
 }
 
 template<typename Callback>
-void BSPWalkCircle(float x, float y, float radiusSquared, Callback &callback)
+void BSPWalkCircle(float x, float y, float radiusSquared, const Callback &callback)
 {
 	if (level.nodes.Size() == 0)
 		callback(&level.subsectors[0]);
diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp
index 548078bed..551f34cbd 100644
--- a/src/gl/scene/gl_weapon.cpp
+++ b/src/gl/scene/gl_weapon.cpp
@@ -420,7 +420,7 @@ void GLSceneDrawer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep)
 			{
 				if (gl_lights && GLRenderer->mLightCount && FixedColormap == CM_DEFAULT && gl_light_sprites)
 				{
-					FSpriteModelFrame *smf = gl_FindModelFrame(playermo->player->ReadyWeapon->GetClass(), psp->GetState()->sprite, psp->GetState()->GetFrame(), false);
+					FSpriteModelFrame *smf = playermo->player->ReadyWeapon ? gl_FindModelFrame(playermo->player->ReadyWeapon->GetClass(), psp->GetState()->sprite, psp->GetState()->GetFrame(), false) : nullptr;
 					if (smf)
 						gl_SetDynModelLight(playermo, true);
 					else