diff --git a/sp/src/game/server/hl2/hl2_player.cpp b/sp/src/game/server/hl2/hl2_player.cpp
index d44849e7..3fa00df0 100644
--- a/sp/src/game/server/hl2/hl2_player.cpp
+++ b/sp/src/game/server/hl2/hl2_player.cpp
@@ -1263,6 +1263,10 @@ Class_T  CHL2_Player::Classify ( void )
 		if(IsInAVehicle())
 		{
 			IServerVehicle *pVehicle = GetVehicle();
+#ifdef MAPBASE
+			if (!pVehicle)
+				return CLASS_PLAYER;
+#endif
 			return pVehicle->ClassifyPassenger( this, CLASS_PLAYER );
 		}
 		else
diff --git a/sp/src/game/server/hl2/weapon_crossbow.cpp b/sp/src/game/server/hl2/weapon_crossbow.cpp
index 8a0f306b..b55fa441 100644
--- a/sp/src/game/server/hl2/weapon_crossbow.cpp
+++ b/sp/src/game/server/hl2/weapon_crossbow.cpp
@@ -1003,7 +1003,7 @@ void CWeaponCrossbow::FireBolt( void )
 inline void CWeaponCrossbow::SetBolt( int iSetting )
 {
 	int iBody = FindBodygroupByName( "bolt" );
-	if (iBody != -1 || (GetOwner() && GetOwner()->IsPlayer())) // HACKHACK: Player models check the viewmodel instead of the worldmodel, so we have to do this manually
+	if (iBody != -1 /*|| (GetOwner() && GetOwner()->IsPlayer())*/) // TODO: Player models check the viewmodel instead of the worldmodel, but setting the bodygroup regardless can cause a crash, so we need a better solution
 		SetBodygroup( iBody, iSetting );
 	else
 		m_nSkin = iSetting;