diff --git a/themable_forms.module b/themable_forms.module
index b2d0877..69445fa 100644
--- a/themable_forms.module
+++ b/themable_forms.module
@@ -25,15 +25,16 @@ function themable_forms_theme_suggestions_form_element(array $variables) {
  * Implements hook_theme_suggestions_form_element_label().
  */
 function themable_forms_theme_suggestions_form_element_label(array $variables) {
-  if (!isset($variables['element']['#form_element_type']) || !isset($variables['element']['#form_id'])) {
-    return [];
+  $suggestions = [];
+  if (isset($variables['element']['#form_element_type'])) {
+    $suggestions[] = 'form_element_label__type__' . $variables['element']['#form_element_type'];
+  }
+  if (isset($variables['element']['#form_id'])) {
+    $suggestions[] = 'form_element_label__form-id__' . $variables['element']['#form_id'];
+  }
+  if (isset($variables['element']['#form_element_type']) && isset($variables['element']['#form_id'])) {
+    $suggestions[] = 'form_element_label__' . $variables['element']['#form_id'] . '__' . $variables['element']['#form_element_type'];
   }
-
-  $suggestions = [
-    'form_element_label__type__' . $variables['element']['#form_element_type'],
-    'form_element_label__form-id__' . $variables['element']['#form_id'],
-    'form_element_label__' . $variables['element']['#form_id'] . '__' . $variables['element']['#form_element_type'],
-  ];
 
   return $suggestions;
 }
@@ -46,10 +47,10 @@ function themable_forms_preprocess_form_element(array &$variables) {
     return;
   }
 
-  if (isset($variables['label']['#form_id'])) {
+  if (isset($variables['element']['#form_id'])) {
     $variables['label']['#form_id'] = $variables['element']['#form_id'];
   }
-  if (isset($variables['label']['#form_element_type'])) {
+  if (isset($variables['element']['#type'])) {
     $variables['label']['#form_element_type'] = $variables['element']['#type'];
   }
 }
@@ -79,3 +80,4 @@ function themable_forms_attach_form_id(&$form, $form_id) {
     themable_forms_attach_form_id($form[$child], $form_id);
   }
 }
+