diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 3d25b8091f..9975342ddd 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -2359,49 +2359,49 @@ void cheevos_populate_menu(void *data)
    menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
    cheevo_t *end                 = NULL;
    cheevo_t *cheevo              = cheevos_locals.core.cheevos;
-
-   if (!cheevo)
-      return;
-
    end                           = cheevo + cheevos_locals.core.count;
 
-   for (i = 0; cheevo < end; i++, cheevo++)
+   if (cheevo)
    {
-      if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
+      for (i = 0; cheevo < end; i++, cheevo++)
       {
+         if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
+         {
          menu_entries_append_enum(info->list, cheevo->title,
-            cheevo->description,
-            MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
-            MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
          items_found++;
          set_badge_info(&badges_ctx, i, cheevo->badge,
                (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
-      }
-      else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE))
-      {
+         }
+         else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE))
+         {
          menu_entries_append_enum(info->list, cheevo->title,
-            cheevo->description,
-            MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
-            MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
          items_found++;
          set_badge_info(&badges_ctx, i, cheevo->badge,
                (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
-      }
-      else
-      {
+         }
+         else
+         {
          menu_entries_append_enum(info->list, cheevo->title,
-            cheevo->description,
-            MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
-            MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
          items_found++;
          set_badge_info(&badges_ctx, i, cheevo->badge,
                (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
+         }
       }
    }
 
-   if (settings->bools.cheevos_test_unofficial)
+   cheevo = cheevos_locals.unofficial.cheevos;
+
+   if (cheevo && settings->bools.cheevos_test_unofficial)
    {
-      cheevo = cheevos_locals.unofficial.cheevos;
       end    = cheevo + cheevos_locals.unofficial.count;
 
       for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)