diff --git a/cheats.c b/cheats.c
index a0ee97d036..4abbc54521 100644
--- a/cheats.c
+++ b/cheats.c
@@ -73,7 +73,10 @@ bool cheat_manager_save(cheat_manager_t *handle, const char *path)
       return false;
 
    if (!handle)
+   {
+      config_file_free(conf);
       return false;
+   }
 
    config_set_int(conf, "cheats", handle->size);
 
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 4c96153bc6..19ad05c124 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -674,7 +674,10 @@ static bool load_preset(cg_shader_data_t *cg, const char *path)
 
    cg->cg_shader = (struct video_shader*)calloc(1, sizeof(*cg->cg_shader));
    if (!cg->cg_shader)
+   {
+      config_file_free(conf);
       return false;
+   }
 
    if (!video_shader_read_conf_cgp(conf, cg->cg_shader))
    {
diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c
index 864beaf99f..6e046abd65 100644
--- a/gfx/drivers_shader/shader_hlsl.c
+++ b/gfx/drivers_shader/shader_hlsl.c
@@ -314,7 +314,10 @@ static bool load_preset(hlsl_shader_data_t *hlsl, void *data, const char *path)
    if (!hlsl->cg_shader)
       hlsl->cg_shader = (struct video_shader*)calloc(1, sizeof(*hlsl->cg_shader));
    if (!hlsl->cg_shader)
+   {
+      config_file_free(conf);
       return false;
+   }
 
    if (!video_shader_read_conf_cgp(conf, hlsl->cg_shader))
    {
diff --git a/gfx/image/image_rpng.c b/gfx/image/image_rpng.c
index daceb8afa8..6ec68cdc81 100644
--- a/gfx/image/image_rpng.c
+++ b/gfx/image/image_rpng.c
@@ -78,7 +78,7 @@ static bool rpng_image_load_tga_shift(const char *path,
    tmp      = buf + 18;
    bits_mul = 3;
 
-   if (bits != 32 || bits != 24)
+   if (bits != 32 && bits != 24)
    {
       RARCH_ERR("Bit depth of TGA image is wrong. Only 32-bit and 24-bit supported.\n");
       free(buf);
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index a42fc79e4a..9181f644ff 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -384,10 +384,11 @@ static void xui_render_message(const char *msg)
 
    struct string_list *list = string_split(msg, "\n");
    d3d_video_t *d3d = (d3d_video_t*)driver.video_data;
-   if (!list || !d3d)
+
+   if (!list)
       return;
 
-   if (list->elems == 0)
+   if (!d3d || list->elems == 0)
    {
       string_list_free(list);
       return;