diff --git a/services/Export_CategoryService.php b/services/Export_CategoryService.php
index 57cc23a..92b3bea 100644
--- a/services/Export_CategoryService.php
+++ b/services/Export_CategoryService.php
@@ -68,10 +68,13 @@ public function getFields(array $settings, $reset)
             );
 
             // Set the dynamic fields for this type
-            foreach (craft()->fields->getLayoutByType(ElementType::Category)->getFields() as $field) {
-                $data = $field->getField();
-                $fields[$data->handle] = array('name' => $data->name, 'checked' => 1, 'fieldtype' => $data->type);
+            if( $group = craft()->categories->getGroupById( $settings["elementvars"]["group"] ) ){
+                foreach (craft()->fields->getLayoutById( $group->fieldLayoutId )->getFields() as $field) {
+                    $data = $field->getField();
+                    $fields[$data->handle] = array('name' => $data->name, 'checked' => 1, 'fieldtype' => $data->type);
+                }
             }
+
         } else {
 
             // Get the stored map