diff --git a/bulk_export/bulk_export.module b/bulk_export/bulk_export.module
index ad8f67a..ed83a82 100644
--- a/bulk_export/bulk_export.module
+++ b/bulk_export/bulk_export.module
@@ -74,16 +74,19 @@ function bulk_export_export($cli = FALSE, $options = array()) {
       $form_state['values']['name'] = $module_name;
       $form_state['values']['tables'] = array();
       foreach ($exportables as $table => $names) {
-        $form_state['values']['tables'][$table] = array();
-        foreach ($names as $name => $title) {
-          $form_state['values']['tables'][$table][$name] = $name;
+        if (!empty($names)) {
+          $form_state['values']['tables'][] = $table;
+          $form_state['values'][$table] = array();
+          foreach ($names as $name => $title) {
+            $form_state['values'][$table][$name] = $name;
+          }
         }
       }
       $output = bulk_export_export_form_submit($form, $form_state);
     }
     else {
       $output = drupal_build_form('bulk_export_export_form', $form_state);
-      $module_name = $form_state['module'];
+      $module_name = $form_state['name'];
     }
 
     if (!empty($form_state['submitted']) || $cli) {