diff --git a/core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java
index 5bf0ac9..b6546cf 100644
--- a/core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java
@@ -97,7 +97,13 @@
 
     private void localEmit(OutboundPacket packet) {
         final Device device = deviceService.getDevice(packet.sendThrough());
+
+        if (device == null) {
+            return;
+        }
+
         final PacketProvider packetProvider = getProvider(device.providerId());
+
         if (packetProvider != null) {
             packetProvider.emit(packet);
         }
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java
index 793e759..123b727 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java
@@ -95,6 +95,10 @@
         NodeId myId = clusterService.getLocalNode().id();
         NodeId master = mastershipService.getMasterFor(packet.sendThrough());
 
+        if (master == null) {
+            return;
+        }
+
         if (myId.equals(master)) {
             notifyDelegate(new PacketEvent(Type.EMIT, packet));
             return;