diff --git a/app/helpers/miq_ae_class_helper.rb b/app/helpers/miq_ae_class_helper.rb
index 97ad0c2878f..24af4963518 100644
--- a/app/helpers/miq_ae_class_helper.rb
+++ b/app/helpers/miq_ae_class_helper.rb
@@ -84,7 +84,7 @@ def ae_field_fonticon(field)
       'product product-array'
     when 'password'
       'product product-password'
-    when 'null coalescing'
+    when 'null coalescing', 'nil_class'
       'fa fa-question'
     when 'host'
       'pficon pficon-screen'
@@ -116,8 +116,13 @@ def ae_field_fonticon(field)
       'product product-state'
     when 'element'
       'product product-element'
+    when 'hash'
+      'fa fa-hashtag'
+    when 'key'
+      'pficon pficon-key'
     else
-      raise NotImplementedError, "Missing fonticon for MiqAeField type #{field}"
+      Rails.logger.warn("Missing fonticon for MiqAeField type \"#{field}\"")
+      'fa fa-file-text-o'
     end
   end
 end