Index: calais.ui.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/opencalais/calais.ui.inc,v
retrieving revision 1.3.2.3.2.12.2.5
diff -r1.3.2.3.2.12.2.5 calais.ui.inc
78a79
>   $form['type']  = array('#type' => 'value', '#value' => $node->type);
148c149,150
<   $node = $form['#node'];
---
>   $nid = $form['#node']->nid;
>   $node = node_load($nid);
196a199,202
>   // Actually load the full node to send along to nodeapi, otherwise things like
>   // pathauto settings get lost. This will also load up the new taxonomy term associations.
>   $node = node_load($node->nid);
>   
200c206
<   drupal_set_message(t('Your term associations have been saved.'));
---
>   drupal_set_message(t('Your Calais tags have been saved.'));
Index: includes/CalaisRdfProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/opencalais/includes/Attic/CalaisRdfProcessor.inc,v
retrieving revision 1.1.2.3
diff -r1.1.2.3 CalaisRdfProcessor.inc
365,369c365,371
<     $sameas = $triples[$guid][self::SAMEAS];
<     if (count($sameas)) {
<       foreach ($sameas as $uri) {
<         $parts = parse_url($uri);
<         $uris[$parts['host']] = $uri;
---
>     if (array_key_exists($guid, $triples)) {
>       $sameas = $triples[$guid][self::SAMEAS];
>       if (count($sameas)) {
>         foreach ($sameas as $uri) {
>           $parts = parse_url($uri);
>           $uris[$parts['host']] = $uri;
>         }
