diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 5dc3685f41..7129d14d88 100755
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -164,7 +164,7 @@ namespace OpenRA
 					orderManager.LastTickTime += Settings.Game.Timestep;
 					Widget.DoTick();
 					var world = orderManager.world;
-					if( orderManager.GameStarted && world.LocalPlayer != null )
+					if (orderManager.GameStarted)
 						++Viewport.TicksSinceLastMove;
 					Sound.Tick();
 					Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } );
diff --git a/OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs b/OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs
index dea73f6b43..4276be228c 100755
--- a/OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs
@@ -29,13 +29,13 @@ namespace OpenRA.Mods.RA.Widgets
 
 		public override void DrawInner()
 		{
-			if (Viewport.TicksSinceLastMove < TooltipDelay || world == null || world.LocalPlayer == null)
+			if (Viewport.TicksSinceLastMove < TooltipDelay || world == null)
 				return;
 
 			var cell = Game.viewport.ViewToWorld(Viewport.LastMousePos).ToInt2();
 			if (!world.Map.IsInMap(cell)) return;
 			
-			if (!world.LocalPlayer.Shroud.IsExplored(cell))
+			if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(cell))
 			{
 				var utext = "Unexplored Terrain";
 				var usz = Game.Renderer.Fonts["Bold"].Measure(utext) + new int2(20, 24);