diff --git a/configuration.c b/configuration.c
index 0154dcd8cc..9d95452cdb 100644
--- a/configuration.c
+++ b/configuration.c
@@ -3549,8 +3549,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
    config_file_free(conf);
    free(buf);
    free(autoconf_file);
-   if (path_new)
-      free(path_new);
+   free(path_new);
    return ret;
 
 error:
diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c
index b3c0f729ba..0e5e5da57a 100644
--- a/menu/widgets/menu_filebrowser.c
+++ b/menu/widgets/menu_filebrowser.c
@@ -274,9 +274,10 @@ void filebrowser_parse(void *data, unsigned type_data)
    }
 
 end:
-   menu_entries_prepend(info->list,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY),
-         path,
-         MENU_ENUM_LABEL_PARENT_DIRECTORY,
-         FILE_TYPE_PARENT_DIRECTORY, 0, 0);
+   if (info)
+      menu_entries_prepend(info->list,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY),
+            path,
+            MENU_ENUM_LABEL_PARENT_DIRECTORY,
+            FILE_TYPE_PARENT_DIRECTORY, 0, 0);
 }
diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index 1004c67bbe..6ab0591318 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -338,16 +338,13 @@ bool netplay_lan_ad_server(netplay_t *netplay)
                   snprintf(port_str, 6, "%hu", ntohs(((struct sockaddr_in*)(&their_addr))->sin_port));
                   if (getaddrinfo_retro(reply_addr, port_str, &hints, &our_addr) < 0)
                      continue;
-                  else
-                  {
-                     RARCH_LOG ("[discovery] sending reply to %s \n", reply_addr);
 
-                     /* And send it */
-                     sendto(lan_ad_server_fd, (const char*)&ad_packet_buffer,
+                  RARCH_LOG ("[discovery] sending reply to %s \n", reply_addr);
+
+                  /* And send it */
+                  sendto(lan_ad_server_fd, (const char*)&ad_packet_buffer,
                         sizeof(struct ad_packet), 0, our_addr->ai_addr, our_addr->ai_addrlen);
-                  }
-                  if (our_addr)
-                     freeaddrinfo_retro(our_addr);
+                  freeaddrinfo_retro(our_addr);
                }
                else
                   continue;