1 files changed, 2 insertions, 8 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py
index 4d66f671a..c79e90459 100644
--- a/Mailman/Cgi/options.py
+++ b/Mailman/Cgi/options.py
@@ -39,14 +39,8 @@ from Mailman.Logging.Syslog import syslog
 
 def main():
     doc = HeadlessDocument()
-    try:
-        path = os.environ['PATH_INFO']
-    except KeyError:
-        path = ''
-
-    parts = Utils.GetPathPieces(path)
-    # sanity check options
-    if len(parts) < 2:
+    parts = Utils.GetPathPieces()
+    if not parts or len(parts) < 2:
         doc.AddItem(Header(2, "Error"))
         doc.AddItem(Bold("Invalid options to CGI script."))
         print doc.Format()