Index: lighting.cpp
===================================================================
--- lighting.cpp	(revision 7117)
+++ lighting.cpp	(working copy)
@@ -762,7 +762,11 @@
 			{
 				LEVELNODE* pShadowNode = NULL;
 				if(!(pStructure->fFlags & STRUCTURE_BASE_TILE))
-					pShadowNode = gpWorldLevelData[ FindBaseStructure(pStructure)->sGridNo ].pShadowHead;
+				{
+					STRUCTURE* pBaseStructure = FindBaseStructure(pStructure);
+					if( pBaseStructure != NULL )
+						pShadowNode = gpWorldLevelData[ pBaseStructure->sGridNo ].pShadowHead;
+				}
 				else
 					pShadowNode = gpWorldLevelData[ sNewGridNo ].pShadowHead;
 				if(pShadowNode != NULL)

Index: LOS.cpp
===================================================================
--- LOS.cpp	(revision 7117)
+++ LOS.cpp	(working copy)
@@ -525,6 +525,11 @@
 	BOOLEAN fFoundBottom = FALSE;
 
 	memset(&ubAllTileProperties,0,sizeof(ubAllTileProperties));
+	if( !( sGridNo > -1 && sGridNo < WORLD_MAX ) || !( bLevel == FIRST_LEVEL || bLevel == SECOND_LEVEL ) )
+	{
+		// incorrect argument values, what the hell?
+		return ubAllTileProperties;
+	}
 	for(UINT8 ubCnt=0; ubCnt<5 && !fFoundBottom; ubCnt++)
 	{
 		if (bLevel == I_ROOF_LEVEL)
@@ -566,7 +571,7 @@
 					break;
 			}
 		}
-		if( pNode!= NULL )
+		if( pNode!= NULL && pNode->usIndex < NUMBEROFTILES )
 		{
 			iWoodCamoAffinity += gTileDatabase[ pNode->usIndex ].bWoodCamoAffinity;
 			iDesertCamoAffinity += gTileDatabase[ pNode->usIndex ].bDesertCamoAffinity;