=== modified file 'includes/path.inc'
--- includes/path.inc	
+++ includes/path.inc	
@@ -90,7 +90,12 @@ function drupal_lookup_path($action, $pa
  */
 function drupal_get_path_alias($path) {
   $result = $path;
+  if (is_array($path)) {
+    $ref = &$path['ref'];
+    $path = $path['path'];
+  }
   if ($alias = drupal_lookup_path('alias', $path)) {
+    $ref = ($result != $alias);
     $result = $alias;
   }
   if (function_exists('custom_url_rewrite')) {
=== modified file 'modules/path.module'
--- modules/path.module	
+++ modules/path.module	
@@ -216,8 +216,9 @@ function path_nodeapi(&$node, $op, $arg)
 
       case 'load':
         $path = "node/$node->nid";
-        $alias = drupal_get_path_alias($path);
-        if ($alias != $path) {
+        $in_path_table = FALSE;
+        $alias = drupal_get_path_alias(array('path' => $path, 'ref' => &$in_path_table));
+        if ($in_path_table && $alias != $path) {
           $node->path = $alias;
         }
         break;