--- import_typepad.module.orig	2006-11-30 19:13:45.000000000 -0600
+++ import_typepad.module	2007-01-05 20:34:25.000000000 -0600
@@ -73,20 +73,21 @@ function typepad_step1_validate($form_id
 
 //  unset($_SESSION[_IMPORT_TYPEPAD][_WORKING_FILE]);
   $file = file_save_upload('upload_file');
-
   if (is_object($file) && $file->error == 0 && $file->filesize > 0) {
     drupal_set_message(t('Using uploaded file'));
     file_move($file->filepath, 'drupal.import_typepad.'. strtr($base_url, array('http://' => '', '/' => '.')) .'.'. $user->uid, 1);
     $_SESSION[_IMPORT_TYPEPAD][_WORKING_FILE] = $file->filepath;
-  } else if (strlen($edit['serverfile'])>0 && file_exists($edit['serverfile'])){
-    drupal_set_message("Using server file ".$edit['serverfile']);
-    // See if there was a server file
-    $_SESSION[_IMPORT_TYPEPAD][_WORKING_FILE] = $edit['serverfile'];
+    return;
   }
 
-  if (!isset($_SESSION[_IMPORT_TYPEPAD][_WORKING_FILE])) {
-    form_set_error('file', t('You must select a file to import.'));
+  $file_name = $form_values['serverside_file'];
+  if (!empty($file_name) && file_exists($file_name)) {
+    drupal_set_message("Using server file ".$file_name);
+    $_SESSION[_IMPORT_TYPEPAD][_WORKING_FILE] = $file_name;
+    return;
   }
+
+  form_set_error('file', t('You must select a file to import.'));
 }
 
 /**