diff --git a/src/main/java/net/onrc/onos/core/topology/SwitchEvent.java b/src/main/java/net/onrc/onos/core/topology/SwitchEvent.java
index fdc4b84..f724fae 100644
--- a/src/main/java/net/onrc/onos/core/topology/SwitchEvent.java
+++ b/src/main/java/net/onrc/onos/core/topology/SwitchEvent.java
@@ -6,8 +6,8 @@
 import java.nio.ByteBuffer;
 import java.util.Objects;
 
+import static com.google.common.base.Preconditions.checkNotNull;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.apache.commons.lang.Validate;
 
 /**
  * Self-contained Switch Object.
@@ -34,8 +34,7 @@
      * @param dpid Dpid to identify this switch
      */
     public SwitchEvent(Dpid dpid) {
-        Validate.notNull(dpid);
-        this.dpid = dpid;
+        this.dpid = checkNotNull(dpid);
     }
 
     /**