diff --git a/includes/tvi.admin.inc b/includes/tvi.admin.inc
index 58ea92c..9b585d3 100755
--- a/includes/tvi.admin.inc
+++ b/includes/tvi.admin.inc
@@ -10,7 +10,7 @@
  * admin/content/taxonomy/edit/vocabulary/$vid
  */
 function tvi_vocab_form(&$form) {
-  if (array_key_exists('#vocabulary', $form)) {
+  if (array_key_exists('#vocabulary', $form) && property_exists($form['#vocabulary'], 'vid')) {
     $vid = (int) $form['#vocabulary']->vid;
 
     tvi_include('query');
@@ -184,8 +184,10 @@ function tvi_taxonomy_admin_form(&$form, $settings) {
 function tvi_validate_handler($form, &$form_state) {
   $values = $form_state['values']['tvi'];
 
-  list($view_name, $display_name) = explode(':', $values['display']);
-  $form_state['values']['tvi']['display'] = $display_name;
+  if(!empty($values['display'])) {
+	  list($view_name, $display_name) = explode(':', $values['display']);
+	  $form_state['values']['tvi']['display'] = $display_name;
+  }
 }
 
 /**
@@ -246,4 +248,4 @@ function tvi_get_view_displays() {
   }
 
   return $displays;
-}
\ No newline at end of file
+}