--- node.inc	2008-08-03 00:23:11.000000000 -0400
+++ node-new.inc	2008-08-21 17:09:59.000000000 -0400
@@ -18,6 +18,7 @@ function panels_node_panels_contexts() {
     'keyword' => 'node',
     'context name' => 'node',
   );
+
   return $args;
 }
 
@@ -41,16 +42,20 @@ function panels_context_create_node($emp
     return $context;
   }
 
-  if ($conf) {
+ if ($conf) {
     $nid = is_array($data) ? $data['nid'] : $data->nid;
 
     if (module_exists('translation')) {
+
        if ($translation = module_invoke('translation', 'node_nid', $nid, $GLOBALS['locale'])) {
-        $nid = $translation;
-        $reload = TRUE;
+        
+        if (!empty($translation)) {
+        	$nid = $translation;
+        	$reload = TRUE;
+        	}
       }
     }
-    
+
     if (is_array($data) || !empty($reload)) {
       $data = node_load($nid);
     }