diff --git a/src/main/java/net/onrc/onos/core/util/LinkTuple.java b/src/main/java/net/onrc/onos/core/util/LinkTuple.java
index 4e80826..7831925 100644
--- a/src/main/java/net/onrc/onos/core/util/LinkTuple.java
+++ b/src/main/java/net/onrc/onos/core/util/LinkTuple.java
@@ -1,8 +1,8 @@
 package net.onrc.onos.core.util;
 
-import java.util.Objects;
+import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.Validate;
+import java.util.Objects;
 
 
 /**
@@ -28,11 +28,8 @@
      * @param dst destination port
      */
     public LinkTuple(SwitchPort src, SwitchPort dst) {
-        Validate.notNull(src);
-        Validate.notNull(dst);
-
-        this.src = src;
-        this.dst = dst;
+        this.src = checkNotNull(src);
+        this.dst = checkNotNull(dst);
     }
 
     /**
diff --git a/src/main/java/net/onrc/onos/core/util/SwitchPort.java b/src/main/java/net/onrc/onos/core/util/SwitchPort.java
index e296b7b..74f0ed4 100644
--- a/src/main/java/net/onrc/onos/core/util/SwitchPort.java
+++ b/src/main/java/net/onrc/onos/core/util/SwitchPort.java
@@ -1,8 +1,9 @@
 package net.onrc.onos.core.util;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import net.onrc.onos.core.util.serializers.SwitchPortSerializer;
 
-import org.apache.commons.lang.Validate;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 /**
@@ -29,10 +30,8 @@
      * @param port the port to use.
      */
     public SwitchPort(Dpid dpid, PortNumber port) {
-        Validate.notNull(dpid);
-        Validate.notNull(port);
-        this.dpid = dpid;
-        this.port = port;
+        this.dpid = checkNotNull(dpid);
+        this.port = checkNotNull(port);
     }
 
     /**