diff --git a/ProtocolLib/dependency-reduced-pom.xml b/ProtocolLib/dependency-reduced-pom.xml
index 52eae950..e3b1885e 100644
--- a/ProtocolLib/dependency-reduced-pom.xml
+++ b/ProtocolLib/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.comphenix.protocol</groupId>
   <artifactId>ProtocolLib</artifactId>
   <name>ProtocolLib</name>
-  <version>1.6.0</version>
+  <version>1.6.1-SNAPSHOT</version>
   <description>Provides read/write access to the Minecraft protocol.</description>
   <url>http://dev.bukkit.org/server-mods/protocollib/</url>
   <developers>
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java b/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java
index e2748cbc..f36ddf0e 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java
@@ -257,7 +257,7 @@ public abstract class AbstractIntervalTree<TKey extends Comparable<TKey>, TValue
 	private void getEntries(Set<Entry> destination, NavigableMap<TKey, EndPoint> map) {
 		Map.Entry<TKey, EndPoint> last = null;
 		
-		for (Map.Entry<TKey, EndPoint> entry : bounds.entrySet()) {
+		for (Map.Entry<TKey, EndPoint> entry : map.entrySet()) {
 			switch (entry.getValue().state) {
 			case BOTH:
 				EndPoint point = entry.getValue();
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java b/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java
index eaea4a7b..488b915d 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java
@@ -23,6 +23,8 @@ import javax.xml.stream.events.XMLEvent;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 
+import com.google.common.base.Preconditions;
+
 /**
  * Check dev.bukkit.org to find updates for a given plugin, and download the updates if needed.
  * <p>
@@ -211,6 +213,13 @@ public class Updater
      */ 
     public Updater(Plugin plugin, Logger logger, String slug, File file, String permission)
     {
+    	// I hate NULL
+    	Preconditions.checkNotNull(plugin, "plugin");
+    	Preconditions.checkNotNull(logger, "logger");
+    	Preconditions.checkNotNull(slug, "slug");
+    	Preconditions.checkNotNull(file, "file");
+    	Preconditions.checkNotNull(permission, "permission");
+    	
         this.plugin = plugin;
         this.file = file;
         this.slug = slug;