diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c
index 59c57a2181..0046da8b8a 100644
--- a/input/drivers/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@@ -57,8 +57,8 @@ static void linuxraw_exitGracefully(int sig)
 
 static void *linuxraw_input_init(void)
 {
-   linuxraw_input_t *linuxraw;
    struct sigaction sa;
+   linuxraw_input_t *linuxraw = NULL;
 
    /* Only work on terminals. */
    if (!isatty(0))
diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
index e816ad19ac..ab83bc402e 100644
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -290,6 +290,8 @@ static bool sdl_set_rumble(void *data, unsigned port,
 static const rarch_joypad_driver_t *sdl_get_joypad_driver(void *data)
 {
    sdl_input_t *sdl = (sdl_input_t*)data;
+   if (!sdl)
+      return NULL;
    return sdl->joypad;
 }