goto out;
        }
 
-       if(list_is_empty()) {
-               fclose(out);
-               unlink(datafile);
-               ret = 1;
-               goto out;
-       }
+       if(!list_is_empty())
+               /*
+                * Possibly should check if write_database failed.
+                * Currently it returns always zero.
+                */
+               write_database(out, e);
 
-       /*
-        * Possibly should check if write_database failed.
-        * Currently it returns always zero.
-        */
-       write_database(out, e);
        fclose(out);
 
        if(access(datafile, F_OK) == 0 &&
 
                                &field, MAX_EMAIL_LEN))
                return; /* user cancelled ( C-g ) */
 
-       /* TODO if list item contains commas, sjould use quotes instead */
+       /* TODO if list item contains commas, should use quotes instead */
        if(field)
                fix_email_str(field);