diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 9d796ba47b..612232f18a 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -112,6 +112,9 @@ const char* config_get_video_driver_options(void)
 
    attr.i = 0;
 
+   if (!options_l)
+      return NULL;
+
    for (i = 0; video_driver_find_handle(i); i++)
    {
       const char *opt = video_driver_find_ident(i);
@@ -121,6 +124,13 @@ const char* config_get_video_driver_options(void)
 
    options = (char*)calloc(options_len, sizeof(char));
 
+   if (!options)
+   {
+      string_list_free(options_l);
+      options_l = NULL;
+      return NULL;
+   }
+
    string_list_join_concat(options, options_len, options_l, "|");
 
    string_list_free(options_l);