diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index d0e6928d5883d8d60c63dd519262f803b1cb6685..a1daeb4e47ca88ed3aa6f0e1c1275d597c3e0295 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -1039,6 +1039,8 @@ public class I2PSnarkServlet extends BasicServlet {
                             }
                             // step 2 delete dirs bottom-up
                             Set<File> dirs = storage.getDirectories();
+                            if (dirs == null)
+                                break;  // directory deleted out from under us
                             if (_log.shouldLog(Log.INFO))
                                 _log.info("Dirs to delete: " + DataHelper.toString(dirs));
                             boolean ok = false;