--- modules/path/path.module.1.163	Thu Aug 13 14:41:48 2009
+++ modules/path/path.module	Thu Aug 13 14:59:21 2009
@@ -236,15 +236,19 @@ function path_form_alter(&$form, $form_s
       '#collapsed' => TRUE,
       '#description' => t('Optionally specify an alternative URL by which this node can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'),
     );
-    if ($path) {
-      $form['path']['pid'] = array(
-        '#type' => 'value',
-        '#value' => db_query("SELECT pid FROM {url_alias} WHERE dst = :dst AND language = :language", array(
-          ':dst' => $path,
-          ':language' => $form['#node']->language
-        ))
-        ->fetchField(),
-      );
+    if (isset($form['#node']->nid)) {
+      $original_node = node_load($form['#node']->nid);
+      if (isset($original_node->path)) {
+        $pid = db_query("SELECT pid FROM {url_alias} WHERE dst = :dst AND language = :language", array(
+            ':dst' => $original_node->path,
+            ':language' => $form['#node']->language,
+          ))
+          ->fetchField();
+        $form['path']['pid'] = array(
+          '#type' => 'value',
+          '#value' => $pid,
+        );
+      }
     }
   }
 }