diff --git a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java
index 6d4aad1a3185c42572a49ca9abcb1d0e18c92586..2e45749b87dff8a631cdc5429695f03eddf5130c 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java
@@ -152,6 +152,7 @@ public class ConnectionAcceptor implements Runnable
             _util.debug("Error while accepting: " + ioe, Snark.ERROR);
             stop = true;
           }
+        // catch oom?
       }
 
     try
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
index f10ef41d33311bf52e39e67696efa250782cbec2..e124955cfc3bc551207bc5291e79f2c25ecdb71e 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@@ -232,7 +232,7 @@ public class Snark
           }
         
         // Explicit shutdown.
-        Runtime.getRuntime().removeShutdownHook(snarkhook);
+        //Runtime.getRuntime().removeShutdownHook(snarkhook);
         snarkhook.start();
       }
   }
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 d42d3b520df2df02822024ae90db29d8dabf6c1a..52e10957396f18211db30057d87dd886b2d3361d 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -202,10 +202,14 @@ public class I2PSnarkServlet extends HttpServlet {
                 } catch (IOException ioe) {
                     _log.warn("hrm: " + local, ioe);
                 }
-            } else if ( (newURL != null) && (newURL.trim().length() > "http://.i2p/".length()) ) {
-                _manager.addMessage("Fetching " + newURL);
-                I2PAppThread fetch = new I2PAppThread(new FetchAndAdd(_manager, newURL), "Fetch and add");
-                fetch.start();
+            } else if (newURL != null) {
+                if (newURL.startsWith("http://")) {
+                    _manager.addMessage("Fetching " + newURL);
+                    I2PAppThread fetch = new I2PAppThread(new FetchAndAdd(_manager, newURL), "Fetch and add");
+                    fetch.start();
+                } else {
+                    _manager.addMessage("Invalid URL - must start with http://");
+                }
             } else {
                 // no file or URL specified
             }
@@ -644,7 +648,7 @@ public class I2PSnarkServlet extends HttpServlet {
     private void writeAddForm(PrintWriter out, HttpServletRequest req) throws IOException {
         String uri = req.getRequestURI();
         String newURL = req.getParameter("newURL");
-        if ( (newURL == null) || (newURL.trim().length() <= 0) ) newURL = "http://";
+        if ( (newURL == null) || (newURL.trim().length() <= 0) ) newURL = "";
         String newFile = req.getParameter("newFile");
         if ( (newFile == null) || (newFile.trim().length() <= 0) ) newFile = "";
         
@@ -772,7 +776,7 @@ public class I2PSnarkServlet extends HttpServlet {
             return bytes + "B";
         else if (bytes < 5*1024*1024)
             return ((bytes + 512)/1024) + "KB";
-        else if (bytes < 5*1024*1024*1024l)
+        else if (bytes < 10*1024*1024*1024l)
             return ((bytes + 512*1024)/(1024*1024)) + "MB";
         else
             return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "GB";