diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
index 708e29f771ecd4da1548e20d1caeb1d1bc659c57..f85e4db831c860a7277284f8611d1426e1b380fa 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
@@ -236,7 +236,7 @@ public class TrackerClient implements Runnable {
    *  Do this one time only (not every time it is started).
    *  @since 0.9.1
    */
-  public void setup() {
+  private void setup() {
     // Construct the list of trackers for this torrent,
     // starting with the primary one listed in the metainfo,
     // followed by the secondary open trackers
@@ -670,7 +670,7 @@ public class TrackerClient implements Runnable {
    *  @return true for i2p hosts only
    *  @since 0.7.12
    */
-  static boolean isValidAnnounce(String ann) {
+  public static boolean isValidAnnounce(String ann) {
     URL url;
     try {
        url = new URL(ann);
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 c96385027626968a20c507137d883b474d69462a..301b4b5ec3239aa88e2c9d4d900a13beea5b3b19 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -825,7 +825,7 @@ public class I2PSnarkServlet extends DefaultServlet {
                 name = name.trim();
                 hurl = hurl.trim();
                 aurl = aurl.trim().replace("=", "=");
-                if (name.length() > 0 && hurl.startsWith("http://") && aurl.startsWith("http://")) {
+                if (name.length() > 0 && hurl.startsWith("http://") && TrackerClient.isValidAnnounce(aurl)) {
                     Map<String, Tracker> trackers = _manager.getTrackerMap();
                     trackers.put(name, new Tracker(name, aurl, hurl));
                     _manager.saveTrackerMap();