diff --git a/gfx/gl.c b/gfx/gl.c
index 926bdff27e..06f8e81ba5 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -291,7 +291,7 @@ static bool gl_shader_init(void *data)
 
 #ifdef HAVE_CG
       case RARCH_SHADER_CG:
-         backend     = &gl_cg_backend;
+         backend = &gl_cg_backend;
          if (*g_settings.video.cg_shader_path)
             shader_path = g_settings.video.cg_shader_path;
          break;
@@ -299,8 +299,9 @@ static bool gl_shader_init(void *data)
 
 #ifdef HAVE_GLSL
       case RARCH_SHADER_GLSL:
-         backend     = &gl_glsl_backend;
-         shader_path = g_settings.video.xml_shader_path;
+         backend = &gl_glsl_backend;
+         if (*g_settings.video.xml_shader_path)
+            shader_path = g_settings.video.xml_shader_path;
          break;
 #endif
 
diff --git a/gfx/shader_cg.c b/gfx/shader_cg.c
index 0a6e175885..ee3075da61 100644
--- a/gfx/shader_cg.c
+++ b/gfx/shader_cg.c
@@ -835,7 +835,7 @@ bool gl_cg_init(const char *path)
    cgGLEnableProfile(cgFProf);
    cgGLEnableProfile(cgVProf);
 
-   if (strstr(path, ".cgp"))
+   if (path && strstr(path, ".cgp"))
    {
       if (!load_preset(path))
          return false;