diff --git a/sites/all/modules/contrib/taxonomy_access/taxonomy_access_admin.inc b/sites/all/modules/contrib/taxonomy_access/taxonomy_access_admin.inc
index 4b8f484..8d23aaf 100644
--- a/sites/all/modules/contrib/taxonomy_access/taxonomy_access_admin.inc
+++ b/sites/all/modules/contrib/taxonomy_access/taxonomy_access_admin.inc
@@ -54,7 +54,7 @@ function theme_taxonomy_access_admin() {
   }
   foreach ($roles as $rid => $name) {
     $ops = array();
-    if ($active[$rid]) {
+    if (!empty($active[$rid])) {
       //only allow delete for "extra" roles
       if ($rid > 2) {
         $ops[] = l(t("disable"), "admin/user/taxonomy_access/delete/$rid");
@@ -95,7 +95,7 @@ function taxonomy_access_admin_delete_role($form_state, $rid) {
 
 // TODO: clarify list VS create grants
 function taxonomy_access_admin_build_row($grants = NULL) {
-  $form['#title'] = $title;
+  $form['#title'] = '';
   $form['#tree'] = TRUE;
   foreach (array('view', 'update', 'delete') as $grant) {
     $form[$grant] = array(
@@ -135,7 +135,7 @@ function taxonomy_access_admin_form($form_state, $rid = NULL) {
   
   //Global default
   $form['vocabs'][0]['#title'] = 'Global';
-  $form['grants'][0][0] = taxonomy_access_admin_build_row($default_grants[0]);
+  $form['grants'][0][0] = (!empty($default_grants[0])) ? taxonomy_access_admin_build_row($default_grants[0]) : taxonomy_access_admin_build_row();
   $form['selected_defaults'][0] = array(
      '#type' => 'checkbox',
      '#disabled' => TRUE,
@@ -273,7 +273,7 @@ function theme_taxonomy_access_admin_form($form) {
     $row = array();
   }
 
-  $output .= theme('table', $header, $rows);
+  $output = theme('table', $header, $rows);
   $output .= drupal_render($form);
 
   return $output;