diff --git a/lib/filehighlight/common.c b/lib/filehighlight/common.c
index 14446a119..349a786d3 100644
--- a/lib/filehighlight/common.c
+++ b/lib/filehighlight/common.c
@@ -57,10 +57,7 @@ mc_fhl_array_free (mc_fhl_t * fhl)
 
         g_free (mc_filter->fgcolor);
         g_free (mc_filter->bgcolor);
-
-        if (mc_filter->search_condition != NULL)
-            mc_search_free (mc_filter->search_condition);
-
+        mc_search_free (mc_filter->search_condition);
         g_free (mc_filter);
     }
     g_ptr_array_free (fhl->filters, TRUE);
diff --git a/lib/search.h b/lib/search.h
index dd55081c3..1e1068860 100644
--- a/lib/search.h
+++ b/lib/search.h
@@ -120,7 +120,7 @@ typedef struct mc_search_type_str_struct {
 
 mc_search_t *mc_search_new (const gchar * original, gsize original_len);
 
-void mc_search_free (mc_search_t * mc_search);
+void mc_search_free (mc_search_t * lc_mc_search);
 
 gboolean mc_search_prepare (mc_search_t * mc_search);
 
diff --git a/lib/search/search.c b/lib/search/search.c
index 2aa0451b4..895df2184 100644
--- a/lib/search/search.c
+++ b/lib/search/search.c
@@ -154,7 +154,7 @@ mc_search_new (const gchar * original, gsize str_len)
 void
 mc_search_free (mc_search_t * lc_mc_search)
 {
-    if (!lc_mc_search)
+    if (lc_mc_search == NULL)
         return;
 
     g_free (lc_mc_search->original);
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 3f677129f..ddd7dd79d 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -1698,11 +1698,8 @@ edit_replace_cmd (WEdit * edit, int again)
         g_free (saved1), saved1 = g_strdup (input1);
         g_free (saved2), saved2 = g_strdup (input2);
 
-        if (edit->search)
-        {
-            mc_search_free (edit->search);
-            edit->search = NULL;
-        }
+        mc_search_free (edit->search);
+        edit->search = NULL;
     }
 
     if (!edit->search)