diff --git a/plugin/npshell.c b/plugin/npshell.c
index d85739c..bb43da3 100644
--- a/plugin/npshell.c
+++ b/plugin/npshell.c
@@ -235,8 +235,8 @@ NPP_Destroy(NPP instance, NPSavedData** save G_GNUC_UNUSED)
   if (This != NULL)
     {
       (void) VirtViewerDestroyWindow (instance);
-      if (This->uri) free (This->uri);
-      if (This->name) free (This->name);
+      free (This->uri);
+      free (This->name);
       NPN_MemFree(instance->pdata);
       instance->pdata = NULL;
     }
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
index 31c4dd9..e1ead3f 100644
--- a/src/virt-viewer.c
+++ b/src/virt-viewer.c
@@ -275,14 +275,10 @@ virt_viewer_extract_xpath_string(const gchar *xmldesc,
     obj = NULL;
 
  error:
-    if (obj)
-        xmlXPathFreeObject(obj);
-    if (ctxt)
-        xmlXPathFreeContext(ctxt);
-    if (xml)
-        xmlFreeDoc(xml);
-    if (pctxt)
-        xmlFreeParserCtxt(pctxt);
+    xmlXPathFreeObject(obj);
+    xmlXPathFreeContext(ctxt);
+    xmlFreeDoc(xml);
+    xmlFreeParserCtxt(pctxt);
     return port;
 }