diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index 5a60cdbf5f..b880f3382c 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -596,7 +596,8 @@ static void *libusb_hid_init(void)
    return hid;
 
 error:
-   libusb_hid_free(hid);
+   if (hid)
+      libusb_hid_free(hid);
    return NULL;
 }
 
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index f1854591ca..fff0eae747 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -411,7 +411,7 @@ static int general_push(menu_displaylist_info_t *info,
          }
          else
          {
-            if (system->valid_extensions)
+            if (!string_is_empty(system->valid_extensions))
                strlcpy(info->exts, system->valid_extensions, sizeof(info->exts));
          }
          break;