diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index ca49beb39c..3b887f91eb 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -544,7 +544,7 @@ static bool uninit_video_input(void)
    if (
          !video_driver_ctl(RARCH_DISPLAY_CTL_OWNS_DRIVER, NULL)
          && video_driver_data 
-         && current_video->free
+         && current_video && current_video->free
       )
       current_video->free(video_driver_data);
 
diff --git a/input/input_driver.c b/input/input_driver.c
index 17fe57374c..bb9ee52bbb 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -762,8 +762,8 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
 
                current_input = (const input_driver_t*)input_driver_find_handle(0);
 
-               if (!current_input)
-                  return false;
+               if (current_input)
+                  return true;
                retro_fail(1, "find_input_driver()");
                return false;
             }