diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs
index 66f8e45abb..8e1f2fe90a 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs
@@ -47,7 +47,7 @@
     </div>
     <div class="large-12 columns">
       <br>
-      <table id="datatable_vms_{{panelId}}_{{role.name}}" class="dataTable twelve ">
+      <table id="datatable_vms_{{panelId}}_{{role.name}}" class="dataTable hover ">
         <thead>
           <tr>
             <th></th>
diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/list.js b/src/sunstone/public/app/tabs/provision-tab/flows/list.js
index 220ecc81f4..e0f51d8062 100644
--- a/src/sunstone/public/app/tabs/provision-tab/flows/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/flows/list.js
@@ -410,7 +410,9 @@ define(function(require) {
 
       if (role.nodes && role.nodes.length > 0) {
         $.each(role.nodes, function(index, node){
-          vms.push(node.vm_info);
+          if(node.vm_info != undefined){
+            vms.push(node.vm_info);
+          }
         })
       }
 
diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
index 75ec906e76..8c2f02accf 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
@@ -169,6 +169,11 @@ define(function(require) {
       },
       "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
         var data = aData.VM;
+
+        if(data == undefined){
+          return nRow;
+        }
+
         var state = get_provision_vm_state(data);
 
         $(".provision_vms_ul", context).append('<div class="column">'+
diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
index 2e37bd3378..6e8c515d09 100644
--- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
+++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
@@ -147,6 +147,7 @@ define(function(require) {
        "",
        "",
        "",
+       "",
        ""
     ];
   }