diff --git a/core_info.c b/core_info.c
index a1890dfe02..cfde9a16b8 100644
--- a/core_info.c
+++ b/core_info.c
@@ -140,9 +140,6 @@ static void core_info_list_free(core_info_list_t *core_info_list)
    {
       core_info_t *info = (core_info_t*)&core_info_list->list[i];
 
-      if (!info)
-         continue;
-
       free(info->path);
       free(info->core_name);
       free(info->systemname);
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 5b577dff35..a7566e3bb1 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -414,8 +414,8 @@ static bool gl_glsl_load_source_path(struct video_shader_pass *pass,
       const char *path)
 {
    ssize_t len;
-   int nitems = filestream_read_file(path,
-         (void**)&pass->source.string.vertex, &len);
+   int nitems = pass ? filestream_read_file(path,
+         (void**)&pass->source.string.vertex, &len) : 0;
 
    if (nitems <= 0 || len <= 0)
       return false;