diff --git a/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java b/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java
index ff3ee8c..6843fa9 100644
--- a/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java
+++ b/src/main/java/net/onrc/onos/core/hostmanager/HostManager.java
@@ -123,7 +123,6 @@
 
         final Dpid dpid = new Dpid(sw.getId());
         final PortNumber portNum = new PortNumber(pi.getInPort());
-        Long mac = eth.getSourceMAC().toLong();
 
         Host srcHost =
                 getSourceHostFromPacket(eth, dpid.value(), portNum.value());
@@ -149,6 +148,7 @@
             topology.releaseReadLock();
         }
 
+        Long mac = eth.getSourceMAC().toLong();
         addHost(mac, srcHost);
 
         if (log.isTraceEnabled()) {
@@ -285,7 +285,8 @@
                         switchPort.getDpid().value(),
                         switchPort.getNumber().value(),
                         new Date(host.getLastSeenTime()));
-                break;
+                // FIXME: remove NOPMD flag after multiple attachment points are implemented
+                break; // NOPMD
             }
         } finally {
             topology.releaseReadLock();