diff --git a/lib/Drupal/configuration/Config/FieldGroupConfiguration.php b/lib/Drupal/configuration/Config/FieldGroupConfiguration.php
new file mode 100644
index 0000000..cea7de7
--- /dev/null
+++ b/lib/Drupal/configuration/Config/FieldGroupConfiguration.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\configuration\Config\FieldGroupHandlerConfiguration.
+ */
+
+namespace Drupal\configuration\Config;
+
+use Drupal\configuration\Config\CtoolsConfiguration;
+use Drupal\configuration\Utils\ConfigIteratorSettings;
+
+class FieldGroupConfiguration extends CtoolsConfiguration {
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::isActive().
+   */
+  public static function isActive() {
+    return module_exists('field_group');
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getComponentHumanName().
+   */
+  static public function getComponentHumanName($component, $plural = FALSE) {
+    return $plural ? t('Field Groups') : t('Field Group');
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::getComponent().
+   */
+  public function getComponent() {
+    return 'field_group';
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::supportedComponents().
+   */
+  static public function supportedComponents() {
+    return array('field_group');
+  }
+
+  /**
+   * Overrides Drupal\configuration\Config\Configuration::alterDependencies().
+   */
+  public static function alterDependencies(Configuration $config, &$stack) {
+    // @todo Implement dependency logic related to Content Type.
+  }
+
+  /**
+   * Implements Drupal\configuration\Config\Configuration::saveToActiveStore().
+   */
+  public function saveToActiveStore(ConfigIteratorSettings &$settings) {
+    ctools_include('export');
+    $object = ctools_export_crud_load($this->getComponent(), $this->getIdentifier());
+    if ($object) {
+      ctools_export_crud_delete($this->getComponent(), $object);
+    }
+    $data = $this->getData();
+    $data->export_type = NULL;
+    $group = field_group_unpack($data);
+    ctools_export_crud_save($this->getComponent(), $group);
+    $settings->addInfo('imported', $this->getUniqueId());
+  }
+
+}
diff --git a/lib/Drupal/configuration/Config/ViewConfiguration.php b/lib/Drupal/configuration/Config/ViewConfiguration.php
index 0f9335e..8e9863e 100644
--- a/lib/Drupal/configuration/Config/ViewConfiguration.php
+++ b/lib/Drupal/configuration/Config/ViewConfiguration.php
@@ -108,7 +108,9 @@ class ViewConfiguration extends CtoolsConfiguration {
                 if (empty($stack[$config_id])) {
                   $view = ConfigurationManagement::createConfigurationInstance($config_id);
                   $view->build();
-                  $config->addToDependencies($view);
+                  if (!$view->broken) {
+                    $config->addToDependencies($view);
+                  }
                   $stack[$config_id] = TRUE;
                 }
                 $config->addToDependencies($view);
@@ -121,7 +123,9 @@ class ViewConfiguration extends CtoolsConfiguration {
             if (empty($stack[$config_id])) {
               $view = ConfigurationManagement::createConfigurationInstance($config_id);
               $view->build();
-              $config->addToDependencies($view);
+              if (!$view->broken) {
+                $config->addToDependencies($view);
+              }
               $stack[$config_id] = TRUE;
             }
             break;
@@ -132,7 +136,9 @@ class ViewConfiguration extends CtoolsConfiguration {
             if (empty($stack[$config_id])) {
               $view = ConfigurationManagement::createConfigurationInstance($config_id);
               $view->build();
-              $config->addToDependencies($view);
+              if (!$view->broken) {
+                $config->addToDependencies($view);
+              }
             }
             $stack[$config_id] = TRUE;
             break;