diff --git a/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Machine.java b/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Machine.java
index d852204..50ef9d6 100644
--- a/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Machine.java
+++ b/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Machine.java
@@ -687,11 +687,12 @@ public class GT_BlockMetaID_Machine extends BlockContainer implements IDebugable
     public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
 	    TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
 	    
-	    if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity) {
-        	return ((IGregTechTileEntity)tTileEntity).getMetaTileID();
+	    if (tTileEntity instanceof IGregTechTileEntity) {
+        	return ((IGregTechTileEntity) tTileEntity).getMetaTileID();
 	    }
-	    
-	    return 0;
+
+		final int meta = aWorld.getBlockMetadata(aX, aY, aZ);
+	    return meta > 0 && meta < 16 ? meta : 0;
     }
 
 	@Override
diff --git a/src/main/java/gregtechmod/common/items/GT_MetaMachine_Item.java b/src/main/java/gregtechmod/common/items/GT_MetaMachine_Item.java
index 1325278..720c335 100644
--- a/src/main/java/gregtechmod/common/items/GT_MetaMachine_Item.java
+++ b/src/main/java/gregtechmod/common/items/GT_MetaMachine_Item.java
@@ -52,9 +52,7 @@ public class GT_MetaMachine_Item extends ItemBlock {
 				mString4[tDamage] = "";
 				mString5[tDamage] = "";
 				mString6[tDamage] = "";
-				if (tDamage == 0) {
-					
-				} else {
+				if (tDamage != 0) {
 					TileEntity temp = GregTech_API.sBlockList[1].createTileEntity(aPlayer.worldObj, tDamage > 15 ? GregTech_API.mMetaTileList[tDamage] == null ? 0 : GregTech_API.mMetaTileList[tDamage].getTileEntityBaseType() : tDamage);
 					if (temp != null) {
 						temp.setWorldObj(aPlayer.worldObj); temp.xCoord = 0; temp.yCoord = 0; temp.zCoord = 0;
@@ -72,7 +70,7 @@ public class GT_MetaMachine_Item extends ItemBlock {
 							if (tTileEntity.getEUCapacity()		> 10000) mString4[tDamage] = I18n.format("metatileentity.TileEntity_EUp_STORE.tooltip",tTileEntity.getEUCapacity()); else mString4[tDamage] = "";
 							mString5[tDamage] = (tTileEntity.isOverclockerUpgradable()?"O ":"") + (tTileEntity.isTransformerUpgradable()?"T ":"") + (tTileEntity.isBatteryUpgradable(0, (byte)0)?"B ":"") + (tTileEntity.isRFConverterUpgradable()?"M ":"") + (tTileEntity.isSteamEngineUpgradable()?"S ":"");
 							if (!mString5[tDamage].equals(""))
-							mString5[tDamage] = I18n.format("metatileentity.TileEntity_UPGRADES.tooltip") + " " + (tTileEntity.isOverclockerUpgradable()?"O ":"") + (tTileEntity.isTransformerUpgradable()?"T ":"") + (tTileEntity.isBatteryUpgradable(0, (byte)0)?"B ":"") + (tTileEntity.isRFConverterUpgradable()?"M ":"") + (tTileEntity.isSteamEngineUpgradable()?"S ":"");
+								mString5[tDamage] = I18n.format("metatileentity.TileEntity_UPGRADES.tooltip") + " " + (tTileEntity.isOverclockerUpgradable()?"O ":"") + (tTileEntity.isTransformerUpgradable()?"T ":"") + (tTileEntity.isBatteryUpgradable(0, (byte)0)?"B ":"") + (tTileEntity.isRFConverterUpgradable()?"M ":"") + (tTileEntity.isSteamEngineUpgradable()?"S ":"");
 							mString6[tDamage] = "";
 						}
 					}