diff --git a/sc2/src/uqm/hyper.c b/sc2/src/uqm/hyper.c index 5d240d088..b39f18103 100644 --- a/sc2/src/uqm/hyper.c +++ b/sc2/src/uqm/hyper.c @@ -1740,6 +1740,10 @@ SaveSisHyperState (void) // Update 'GLOBAL (ShipFacing)' to the direction the flagship is facing hSisElement = getSisElement (); + if (!hSisElement) + { // Happens when saving a game from Hyperspace encounter screen + return; + } //if (ElementPtr->state_flags & PLAYER_SHIP) LockElement (hSisElement, &ElementPtr); GetElementStarShip (ElementPtr, &StarShipPtr);