diff --git a/features.module b/features.module
index 4726c31..02981c7 100644
--- a/features.module
+++ b/features.module
@@ -387,7 +387,6 @@ function features_include($reset = FALSE) {
     // Note that ctools is placed last because it implements hooks "dynamically" for other modules.
     $modules = array('features', 'block', 'context', 'field', 'filter', 'image', 'locale', 'menu', 'node', 'shortcut', 'taxonomy', 'user', 'views', 'ctools');
 
-
     foreach (array_filter($modules, 'module_exists') as $module) {
       module_load_include('inc', 'features', "includes/features.$module");
     }
diff --git a/includes/features.shortcut.inc b/includes/features.shortcut.inc
index 6816591..cfdb6d3 100644
--- a/includes/features.shortcut.inc
+++ b/includes/features.shortcut.inc
@@ -24,19 +24,20 @@ function shortcut_set_features_export($data, &$export, $module_name = '') {
 
   $map = features_get_default_map('menu_links', 'menu_links_features_identifier');
   foreach ($data as $shortcut_set_name) {
-    $shortcut_set = shortcut_set_load($shortcut_set_name);
-    foreach ($shortcut_set->links as $link) {
-      $identifier = menu_links_features_identifier($link);
+    if ($shortcut_set = shortcut_set_load($shortcut_set_name)) {
+      foreach ($shortcut_set->links as $link) {
+        $identifier = menu_links_features_identifier($link);
 
-      // If this link is provided by a different module, add it as a dependency.
-      if (isset($map[$identifier]) && $map[$identifier] != $module_name) {
-        $export['dependencies'][$map[$identifier]] = $map[$identifier];
-      }
-      else {
-        $export['features']['menu_links'][$identifier] = $identifier;
+        // If this link is provided by a different module, add it as a dependency.
+        if (isset($map[$identifier]) && $map[$identifier] != $module_name) {
+          $export['dependencies'][$map[$identifier]] = $map[$identifier];
+        }
+        else {
+          $export['features']['menu_links'][$identifier] = $identifier;
+        }
       }
+      $export['features']['shortcut_set'][$shortcut_set_name] = $shortcut_set_name;
     }
-    $export['features']['shortcut_set'][$shortcut_set_name] = $shortcut_set_name;
   }
   return array();
 }
@@ -83,21 +84,18 @@ function shortcut_set_features_revert($module) {
 function shortcut_set_features_rebuild($module) {
   if ($defaults = features_get_default('shortcut_set', $module)) {
     foreach ($defaults as $shortcut_set) {
-      // Save and remove the old set name to get around http://drupal.org/node/1175700.
-      $old_set_name = $shortcut_set['set_name'];
-      unset($shortcut_set['set_name']);
       $shortcut_set = (object)$shortcut_set;
-      
+
       shortcut_set_save($shortcut_set);
       $new_set_name = $shortcut_set->set_name;
-      
+
       // Update all the menu_links rows which used to be part of $old_set_name to make them
       // members of $new_set_name.
       db_update('menu_links')
         ->fields(array(
-          'menu_name' => $new_set_name
+          'menu_name' => $shortcut_set->set_name
         ))
-        ->condition('menu_name', $old_set_name, '=')
+        ->condition('menu_name', $shortcut_set->set_name, '=')
         ->execute();
       menu_cache_clear_all();
     }