diff --git a/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftItemLine.java b/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftItemLine.java
index 33f3a2c5..159a7399 100644
--- a/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftItemLine.java
+++ b/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftItemLine.java
@@ -69,8 +69,8 @@ public class CraftItemLine extends CraftTouchableLine implements ItemLine {
 	
 	@Override
 	public void setTouchHandler(TouchHandler touchHandler) {
-		if (nmsItem != null) {
-			Location loc = nmsItem.getBukkitEntityNMS().getLocation();
+		if (nmsVehicle != null) {
+			Location loc = nmsVehicle.getBukkitEntityNMS().getLocation();
 			super.setTouchHandler(touchHandler, loc.getWorld(), loc.getX(), loc.getY() - getItemOffset(), loc.getZ());
 		} else {
 			super.setTouchHandler(touchHandler, null, 0, 0, 0);
diff --git a/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftTextLine.java b/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftTextLine.java
index 31c606a6..fb4040e0 100644
--- a/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftTextLine.java
+++ b/Plugin/src/main/java/com/gmail/filoghost/holographicdisplays/object/line/CraftTextLine.java
@@ -86,12 +86,9 @@ public class CraftTextLine extends CraftTouchableLine implements TextLine {
 	
 	@Override
 	public void setTouchHandler(TouchHandler touchHandler) {
-		
 		if (nmsNameble != null) {
-			
 			Location loc = nmsNameble.getBukkitEntityNMS().getLocation();
 			super.setTouchHandler(touchHandler, loc.getWorld(), loc.getX(), loc.getY() - getTextOffset(), loc.getZ());
-			
 		} else {
 			super.setTouchHandler(touchHandler, null, 0, 0, 0);
 		}