diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js b/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js
index 778c8e3efc..0d5a198248 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js
@@ -19,7 +19,7 @@ define(function(require) {
   function roleElements() {
     var selected_nodes = [];
 
-    var dataTable = $('#datatable_service_roles', '#'+TAB_ID+' #'+ROLES_PANEL_ID);
+    var dataTable = $('table[id^=datatable_roles]', '#'+TAB_ID+' #'+ROLES_PANEL_ID);
     var nodes = $('tbody input.check_item:checked', dataTable);
     $.each(nodes, function() {
       selected_nodes.push($(this).val());
@@ -31,7 +31,7 @@ define(function(require) {
   function roleVMElements() {
     var selected_nodes = [];
 
-    var dataTable = $('table[id^=datatable_service_vms]', '#'+TAB_ID+' #'+ROLES_PANEL_ID);
+    var dataTable = $('table[id^=datatable_vms]', '#'+TAB_ID+' #'+ROLES_PANEL_ID);
     var nodes = $('tbody input.check_item:checked', dataTable);
     $.each(nodes, function() {
       selected_nodes.push($(this).val());
@@ -477,4 +477,4 @@ define(function(require) {
   };
 
   return _actions;
-});
\ No newline at end of file
+});
diff --git a/src/sunstone/public/app/utils/dialogs/confirm.js b/src/sunstone/public/app/utils/dialogs/confirm.js
index c8da6e38f0..6b04f356f0 100644
--- a/src/sunstone/public/app/utils/dialogs/confirm.js
+++ b/src/sunstone/public/app/utils/dialogs/confirm.js
@@ -51,7 +51,7 @@ define(function(require) {
     var button = Sunstone.getButton(tabId, actionId);
 
     var tip = Locale.tr("You have to confirm this action");
-    if (button.tip) {
+    if (button && button.tip) {
       tip = button.tip
     }