diff --git a/modules/features_ui/features_ui.module b/modules/features_ui/features_ui.module
index 3f92339..74cd176 100644
--- a/modules/features_ui/features_ui.module
+++ b/modules/features_ui/features_ui.module
@@ -14,7 +14,12 @@ function features_ui_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'features.assignment':
       $output = '';
-      $output .= '<p>' . t('Manage bundles and assignment methods and select the order in which they will be run.') . '</p>';
+      $output .= '<p>' . t('Bundles are used to collect together groups of features. A bundle provides a shared <a href=":namespace">namespace</a> for all features included in it, which prevents conflicts and helps distinguish your features from those produced for other purposes. Common uses of bundles include:', array(':namespace' => 'http://en.wikipedia.org/wiki/Namespace')); 
+      $output .= '<ul>';
+      $output .= '<li>' . t('Custom features for use on a particular site.') . '</li>';
+      $output .= '<li>' . t('The features of a given <a href=":distributions">distribution</a>.', array(':distributions' => 'https://www.drupal.org/documentation/build/distributions')) . '</li>';
+      $output .= '</ul></p>';
+      $output .= '<p>' . t('Use the form below to manage bundles. Each bundle comes with a set of assignment methods. By configuring and ordering the assignment methods, you can set the defaults for what does and doesn\'t get packaged into features for your bundle. Use the <em>Bundle</em> select to choose which bundle to edit, or chose <em>--New--</em> to create a new bundle. The <em>Default</em> bundle does not include a namespace and cannot be deleted.') . '</p>';
       return $output;
 
     case 'features.export':
diff --git a/modules/features_ui/src/Form/FeaturesExportForm.php b/modules/features_ui/src/Form/FeaturesExportForm.php
index 033480f..720e50d 100644
--- a/modules/features_ui/src/Form/FeaturesExportForm.php
+++ b/modules/features_ui/src/Form/FeaturesExportForm.php
@@ -154,12 +154,20 @@ class FeaturesExportForm extends FormBase {
       '#attributes' => array('class' => 'features-header'),
     );
 
+    $bundle_options = $this->assigner->getBundleOptions();
+
+    // If there are no custom bundles, provide message.
+    if (count($bundle_options) < 2) {
+      drupal_set_message($this->t('You have not yet created any bundles. Before generating features, you may wish to <a href=":create">create a bundle</a> to group your features within.', [':create' => Url::fromRoute('features.assignment')->toString()]
+));
+    }
+
     $form['#prefix'] = '<div id="edit-features-wrapper">';
     $form['#suffix'] = '</div>';
     $form['header']['bundle'] = array(
       '#title' => t('Bundle'),
       '#type' => 'select',
-      '#options' => $this->assigner->getBundleOptions(),
+      '#options' => $bundle_options,
       '#default_value' => $current_bundle->getMachineName(),
       '#prefix' => '<div id="edit-package-set-wrapper">',
       '#suffix' => '</div>',