diff --git a/plugins/content_types/vocabulary_context/vocabulary_terms.inc b/plugins/content_types/vocabulary_context/vocabulary_terms.inc
index 79897efc80eb774dc7e118d9a4ce141862a25357..066f2377ab7978ef4d82d686c7765610038115b5 100644
--- a/plugins/content_types/vocabulary_context/vocabulary_terms.inc
+++ b/plugins/content_types/vocabulary_context/vocabulary_terms.inc
@@ -41,7 +41,7 @@ function ctools_vocabulary_terms_content_type_render($subtype, $conf, $panel_arg
   $block->module  = 'node_type';
   $block->title = check_plain($vocab->name);
   $block->content = $output;
-  $block->delta   = $vocab->tid;
+  $block->delta   = $vocab->vid;
 
   return $block;
 }
diff --git a/plugins/contexts/vocabulary.inc b/plugins/contexts/vocabulary.inc
index 23cd96ecfe180ddf6246e407cf276bfc6c4853a6..d7777c8ebdfdc115be8f8689330ffa56b825e988 100644
--- a/plugins/contexts/vocabulary.inc
+++ b/plugins/contexts/vocabulary.inc
@@ -35,7 +35,7 @@ function ctools_context_create_vocabulary($empty, $data = NULL, $conf = FALSE) {
     return $context;
   }
 
-  if ($conf) {
+  if ($conf && isset($data['vid'])) {
     $data = taxonomy_vocabulary_load($data['vid']);
   }
 
@@ -61,7 +61,7 @@ function ctools_context_vocabulary_settings_form($conf, $external = FALSE) {
     '#title' => t('Vocabulary'),
     '#type' => 'select',
     '#options' => $options,
-    '#default_value' => $conf['vids'],
+    '#default_value' => isset($conf['vids']) ? $conf['vids'] : array(),
     '#prefix' => '<div class="clear-block">',
     '#suffix' => '</div>',
     '#description' => t('Select the vocabulary for this form.'),