diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 40f5ed78ce..3112aabadb 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -914,7 +914,7 @@ static void *gl_glsl_init(void *data, const char *path)
       if (*glsl->shader->script_class)
          info.script_class= glsl->shader->script_class;
 #endif
-      info.script_is_file = NULL;
+      info.script_is_file = false;
 
       glsl->state_tracker = state_tracker_init(&info);
 
diff --git a/menu/drivers_display/menu_display_d3d.c b/menu/drivers_display/menu_display_d3d.c
index cc1525aa82..e7b300498b 100644
--- a/menu/drivers_display/menu_display_d3d.c
+++ b/menu/drivers_display/menu_display_d3d.c
@@ -236,11 +236,12 @@ static bool menu_display_d3d_font_init_first(
       bool is_threaded)
 {
    font_data_t **handle = (font_data_t**)font_handle;
-   *handle = font_driver_init_first(video_data,
+   if (!(*handle = font_driver_init_first(video_data,
          font_path, font_size, true,
          is_threaded,
-         FONT_DRIVER_RENDER_DIRECT3D_API);
-   return *handle;
+         FONT_DRIVER_RENDER_DIRECT3D_API)))
+		 return false;
+   return true;
 }
 
 menu_display_ctx_driver_t menu_display_ctx_d3d = {
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index afc1a9b405..b877b94d96 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -249,12 +249,12 @@ static bool menu_display_gl_font_init_first(
       bool is_threaded)
 {
    font_data_t **handle = (font_data_t**)font_handle;
-   *handle = font_driver_init_first(video_data,
+   if (!(*handle = font_driver_init_first(video_data,
          font_path, font_size, true, 
          is_threaded,
-         FONT_DRIVER_RENDER_OPENGL_API);
-
-   return *handle;
+         FONT_DRIVER_RENDER_OPENGL_API)))
+		 return false;
+   return true;
 }
 
 menu_display_ctx_driver_t menu_display_ctx_gl = {