diff --git a/edit_list.php b/edit_list.php
index ef494c3..f8472b3 100644
--- a/edit_list.php
+++ b/edit_list.php
@@ -28,7 +28,7 @@ if ( strlen($list_name) > 30 )
 }
 
 // Test list existence
-if( !is_dir("$lists_path/$domain/$list_name") )
+if( !is_dir("$lists_path/$domain/$list_name") || $list_name == "" ) )
 {
     header("Location: error.php");
     exit();
diff --git a/save_list.php b/save_list.php
index 608b87d..2223e3c 100644
--- a/save_list.php
+++ b/save_list.php
@@ -46,7 +46,7 @@ if ( strlen($list_name) > 30 )
 }
 
 // Test list existence
-if( !is_dir("$lists_path/$domain/$list_name") )
+if( !is_dir("$lists_path/$domain/$list_name") || $list_name == "" )
 {
     header("Location: error.php");
     exit();