diff --git a/src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java b/src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java
index d42c60d..19be570 100644
--- a/src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java
+++ b/src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java
@@ -54,7 +54,7 @@ public abstract class CommandBuilderNBT extends CommandBuilder implements IComma
 		{
 			INBT serialized = component.serialize();
 			
-			if(serialized != null)
+			if(component.getTag() != null && serialized != null)
 			{
 				if(!nbt.contains(component.getTag()))
 				{
@@ -71,14 +71,9 @@ public abstract class CommandBuilderNBT extends CommandBuilder implements IComma
 		return nbt;
 	}
 	
-	protected <T extends IBuilderComponent> T registerNBTComponent(T component, String id)
+	public <T extends IBuilderComponent> T registerNBTComponent(T component)
 	{
 		this.TAG_TO_COMPONENT.add(component);
 		return component;
 	}
-	
-	protected <T extends IBuilderComponent> T registerNBTComponent(T component)
-	{
-		return this.registerNBTComponent(component, component.getTag());
-	}
 }