diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java b/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java
index d1b767cb..96fc7d8f 100644
--- a/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java
+++ b/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java
@@ -6,7 +6,6 @@ import cpw.mods.fml.common.Optional;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.chunk.Chunk;
-import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IUpgradable;
 import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.EnumUpgradeTypes;
diff --git a/src/main/java/cr0s/warpdrive/command/CommandSpace.java b/src/main/java/cr0s/warpdrive/command/CommandSpace.java
index e9416302..43c6adf0 100644
--- a/src/main/java/cr0s/warpdrive/command/CommandSpace.java
+++ b/src/main/java/cr0s/warpdrive/command/CommandSpace.java
@@ -33,7 +33,7 @@ public class CommandSpace extends CommandBase {
 		int targetDimensionId = Integer.MAX_VALUE;
 		
 		EntityPlayerMP player = null;
-		if (sender != null && sender instanceof EntityPlayerMP) {
+		if (sender instanceof EntityPlayerMP) {
 			player = (EntityPlayerMP) sender;
 		}
 		
diff --git a/src/main/java/cr0s/warpdrive/data/JumpBlock.java b/src/main/java/cr0s/warpdrive/data/JumpBlock.java
index e1e1e1d5..885fe463 100644
--- a/src/main/java/cr0s/warpdrive/data/JumpBlock.java
+++ b/src/main/java/cr0s/warpdrive/data/JumpBlock.java
@@ -131,7 +131,7 @@ public class JumpBlock {
 					}
 				} else {
 					WarpDrive.logger.info(" deploy failed to create new tile entity at " + x + ", " + y + ", " + z + " blockId " + block + ":" + blockMeta);
-					WarpDrive.logger.info("NBT data was " + ((oldnbt == null) ? "null" : oldnbt.toString()));
+					WarpDrive.logger.info("NBT data was " + oldnbt);
 				}
 			}
 		} catch (Exception exception) {
diff --git a/src/main/java/cr0s/warpdrive/data/Vector3.java b/src/main/java/cr0s/warpdrive/data/Vector3.java
index d0c6716d..bf75c0ea 100644
--- a/src/main/java/cr0s/warpdrive/data/Vector3.java
+++ b/src/main/java/cr0s/warpdrive/data/Vector3.java
@@ -676,11 +676,8 @@ public class Vector3 implements Cloneable {
 					if (aabb.isVecInside(startingPosition)) {
 						if (0.0D < closestEntity || closestEntity == 0.0D) {
 							pickedEntity = new MovingObjectPosition(entityHit);
-
-							if (pickedEntity != null) {
-								pickedEntity.hitVec = hitMOP.hitVec;
-								closestEntity = 0.0D;
-							}
+							pickedEntity.hitVec = hitMOP.hitVec;
+							closestEntity = 0.0D;
 						}
 					} else {
 						double distance = startingPosition.distanceTo(hitMOP.hitVec);