diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java
index b2bdda301..fc44ab734 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java
@@ -57,8 +57,8 @@ public class Assignment {
     }
 
     public Assignment(String name, String path, List<String> hints) {
-        if (path.equals("")) {
-            System.out.println(name);
+        if (path.equals("") || path.equals("/") || path.equals("/WebGoat/")) {
+            throw new IllegalStateException("The path of assignment '" + name + "' overrides WebGoat endpoints, please choose a path within the scope of the lesson");
         }
         this.name = name;
         this.path = path;
diff --git a/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpBasicsInterceptRequest.java b/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpBasicsInterceptRequest.java
index b3b214708..62e767249 100644
--- a/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpBasicsInterceptRequest.java
+++ b/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpBasicsInterceptRequest.java
@@ -47,10 +47,4 @@ public class HttpBasicsInterceptRequest extends AssignmentEndpoint {
             return trackProgress(failed().feedback("http-proxies.intercept.failure").build());
         }
     }
-
-    @ExceptionHandler(MissingServletRequestParameterException.class)
-    public AttackResult handleMissingParams() {
-        return trackProgress(failed().feedback("http-proxies.intercept.failure").build());
-    }
-
 }