diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index 734499b63..e187443d2 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -2738,13 +2738,13 @@ void MI_Firebolt(Missile &missile)
 	if (missile._mitype != MIS_BONESPIRIT || missile._mimfnum != 8) {
 		switch (missile.sourceType()) {
 		case MissileSource::Player: {
-			const Player *player = missile.sourcePlayer();
+			const Player &player = *missile.sourcePlayer();
 			switch (missile._mitype) {
 			case MIS_FIREBOLT:
-				d = GenerateRnd(10) + (player->_pMagic / 8) + missile._mispllvl + 1;
+				d = GenerateRnd(10) + (player._pMagic / 8) + missile._mispllvl + 1;
 				break;
 			case MIS_FLARE:
-				d = 3 * missile._mispllvl - (player->_pMagic / 8) + (player->_pMagic / 2);
+				d = 3 * missile._mispllvl - (player._pMagic / 8) + (player._pMagic / 2);
 				break;
 			case MIS_BONESPIRIT:
 				d = 0;
@@ -2754,8 +2754,8 @@ void MI_Firebolt(Missile &missile)
 			}
 		} break;
 		case MissileSource::Monster: {
-			const Monster *monster = missile.sourceMonster();
-			d = monster->minDamage + GenerateRnd(monster->maxDamage - monster->minDamage + 1);
+			const Monster &monster = *missile.sourceMonster();
+			d = monster.minDamage + GenerateRnd(monster.maxDamage - monster.minDamage + 1);
 		} break;
 		case MissileSource::Trap:
 			d = currlevel + GenerateRnd(2 * currlevel);