--- public/modules/system/system.module	22 Oct 2008 19:36:26 -0000	1.585.2.23
+++ public/modules/system/system.module	27 Nov 2008 00:18:02 -0000
@@ -1677,8 +1677,14 @@
       }
       break;
     default:
-      // We are being called directly.
-      $node = $object;
+      // Check context for node.
+      if (!isset($object) && isset($context['node'])) {
+        $node = $context['node'];
+      }
+      else {
+        // We are being called directly.
+        $node = $object;
+      }
   }
 
   $recipient = $context['recipient'];
@@ -1805,8 +1811,14 @@
       );
       break;
     default:
-      // We are being called directly.
-      $node = $object;
+      // Check context for node.
+      if (!isset($object) && isset($context['node'])) {
+        $node = $context['node'];
+      }
+      else {
+        // We are being called directly.
+        $node = $object;
+      }
   }
 
   if (isset($node) && is_object($node)) {