diff --git a/client/app/scripts/charts/nodes-grid.js b/client/app/scripts/charts/nodes-grid.js
index 94f652033..4f2d46369 100644
--- a/client/app/scripts/charts/nodes-grid.js
+++ b/client/app/scripts/charts/nodes-grid.js
@@ -61,7 +61,7 @@ function renderIdCell(props) {
   const showSubLabel = Boolean(props.pseudo);
 
   return (
-    <div className="nodes-grid-id-column">
+    <div title={props.label} className="nodes-grid-id-column">
       <div style={iconStyle}><i className="fa fa-square" /></div>
       <div className="truncate">
         {props.label} {showSubLabel &&
diff --git a/client/app/scripts/components/node-details/node-details-table.js b/client/app/scripts/components/node-details/node-details-table.js
index b8b450399..bc403712a 100644
--- a/client/app/scripts/components/node-details/node-details-table.js
+++ b/client/app/scripts/components/node-details/node-details-table.js
@@ -75,7 +75,7 @@ function getValueForSortBy(sortBy) {
 function getMetaDataSorters(nodes) {
   // returns an array of sorters that will take a node
   return _.get(nodes, [0, 'metadata'], []).map((field, index) => node => {
-    const nodeMetadataField = node.metadata[index];
+    const nodeMetadataField = node.metadata && node.metadata[index];
     if (nodeMetadataField) {
       if (isNumberField(nodeMetadataField)) {
         return parseFloat(nodeMetadataField.value);