diff --git a/command.c b/command.c
index 83dc781f8b..7897d0efe0 100644
--- a/command.c
+++ b/command.c
@@ -1956,7 +1956,7 @@ bool command_event(enum event_command cmd, void *data)
       case CMD_EVENT_UNLOAD_CORE:
       case CMD_EVENT_QUIT:
 #ifdef HAVE_MENU
-      if (settings->confirm_on_exit)
+      if (settings && settings->confirm_on_exit)
       {
          if (menu_driver_ctl(RARCH_MENU_CTL_IS_QUIT_CONFIRM, NULL))
          {
diff --git a/input/input_overlay.c b/input/input_overlay.c
index 5241d6daff..d1a1680cb5 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -145,9 +145,12 @@ static void input_overlay_set_vertex_geom(input_overlay_t *ol)
 void input_overlay_set_scale_factor(input_overlay_t *ol, float scale)
 {
    size_t i;
-
+    
+   /* TODO/FIXME - Bad hackery. Should get rid of this */
    if (!ol)
       ol = overlay_ptr;
+   if (!ol)
+      return;
 
    for (i = 0; i < ol->size; i++)
       input_overlay_scale(&ol->overlays[i], scale);