diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
index b9acaca3e5669b17d5a58c2928d2a44e1cb2d01f..5618d256459f57a592b44571a4f339c8bb4aaa98 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
@@ -56,12 +56,16 @@ class FloodfillStoreJob extends StoreJob {
     protected void succeed() {
         super.succeed();
 
-        if (_state != null) {
             if (_facade.isVerifyInProgress(_state.getTarget())) {
                 if (_log.shouldLog(Log.INFO))
                     _log.info("Skipping verify, one already in progress for: " + _state.getTarget());
                 return;
             }
+            if (getContext().router().gracefulShutdownInProgress()) {
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Skipping verify, shutdown in progress for: " + _state.getTarget());
+                return;
+            }
             // Get the time stamp from the data we sent, so the Verify job can meke sure that
             // it finds something stamped with that time or newer.
             DatabaseEntry data = _state.getData();
@@ -81,7 +85,6 @@ class FloodfillStoreJob extends StoreJob {
             } catch (NoSuchElementException nsee) {}
             getContext().jobQueue().addJob(new FloodfillVerifyStoreJob(getContext(), _state.getTarget(),
                                                                        published, isRouterInfo, sentTo, _facade));
-        }
     }
     
     @Override