diff --git a/src/lib-sieve/storage/file/sieve-file-script.c b/src/lib-sieve/storage/file/sieve-file-script.c
index 23d499a5c07f5db66f49df19a488f8cd15ef92e7..d6cfe69c92e84ec753815d1117bc35f6d89c48e0 100644
--- a/src/lib-sieve/storage/file/sieve-file-script.c
+++ b/src/lib-sieve/storage/file/sieve-file-script.c
@@ -354,13 +354,7 @@ static int sieve_file_script_open
 			if ( ret < 0 ) {
 				/* Make sure we have a script name for the error */
 				if ( name == NULL ) {
-					if ( basename == NULL ) {
-						if ( filename == NULL )
-							filename = path_split_filename(path, &dirpath);
-						basename = sieve_script_file_get_scriptname(filename);
-						if ( basename == NULL )
-							basename = filename;
-					}
+					i_assert( basename != NULL );
 					name = basename;
 				}
 				sieve_file_script_handle_error
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.c b/src/lib-sieve/storage/file/sieve-file-storage.c
index 81b2cb892ea1a60db90aad1254e95626cd14859d..15a2183df63424e8a66198482079ddbfc7483e2f 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.c
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c
@@ -298,6 +298,8 @@ static int sieve_file_storage_init_common
 	bool have_link = FALSE;
 	int ret;
 
+	i_assert( storage_path != NULL || active_path != NULL );
+
 	fstorage->prev_mtime = (time_t)-1;
 
 	/* Get active script path */