diff --git a/integration/modules/Waila.java b/integration/modules/Waila.java
index 07d5da1e0..fab80cc77 100644
--- a/integration/modules/Waila.java
+++ b/integration/modules/Waila.java
@@ -96,7 +96,7 @@ public class Waila extends BaseModule implements IWailaDataProvider
 		if ( ThingOfInterest instanceof TileEnergyCell )
 		{
 			NBTTagCompound c = accessor.getNBTData();
-			if ( c != null )
+			if ( c != null && c.hasKey( "internalCurrentPower" ) )
 			{
 				TileEnergyCell tec = (TileEnergyCell) ThingOfInterest;
 				long power = (long) (100 * c.getDouble( "internalCurrentPower" ));
diff --git a/tile/networking/TileEnergyCell.java b/tile/networking/TileEnergyCell.java
index 961bbd37a..51ff7dc45 100644
--- a/tile/networking/TileEnergyCell.java
+++ b/tile/networking/TileEnergyCell.java
@@ -56,7 +56,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
 		@Override
 		public void writeToNBT(NBTTagCompound data)
 		{
-			data.setDouble( "internalCurrentPower", internalCurrentPower );
+			if ( !worldObj.isRemote )
+				data.setDouble( "internalCurrentPower", internalCurrentPower );
 		}
 
 		@Override