EntityMenu tweaks

frontend/src/metabase/components/EntityMenu.jsx

@@ -92,7 +92,9 @@ class EntityMenu extends Component {
                   {menuItemContent || (
                     <ol className="py1" style={{ minWidth: 210 }}>
                       {items.map(item => {
-                        if (item.content) {
+                        if (!item) {
+                          return null;
+                        } else if (item.content) {
                           return (
                             <li key={item.title}>
                               <EntityMenuItem

frontend/src/metabase/components/EntityMenuItem.jsx

@@ -80,7 +80,7 @@ const EntityMenuItem = ({
 
   const content = (
     <Item>
-      <Icon name={icon} mr={1} />
+      {icon && <Icon name={icon} mr={1} />}
       <span className="text-bold">{title}</span>
     </Item>
   );