Index: cmis_common/cmis_common.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cmis/cmis_common/Attic/cmis_common.module,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 cmis_common.module
--- cmis_common/cmis_common.module	8 Mar 2010 20:30:25 -0000	1.1.2.10
+++ cmis_common/cmis_common.module	24 Mar 2010 16:02:14 -0000
@@ -97,7 +97,7 @@ function cmis_common_cmis_service($url, 
         '@code' => $retval->code,
         '@response' => $retval->body,
         '@url' => $url
-      )));
+      )), $retval->code);
     }
   }
   else {
Index: cmis_sync/cmis_sync.cmis.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cmis/cmis_sync/cmis_sync.cmis.inc,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 cmis_sync.cmis.inc
--- cmis_sync/cmis_sync.cmis.inc	18 Mar 2010 09:03:09 -0000	1.1.2.12
+++ cmis_sync/cmis_sync.cmis.inc	24 Mar 2010 16:02:14 -0000
@@ -207,10 +207,16 @@ function _cmis_sync_cmis_drupal_prepare(
     if (array_key_exists('content_field', $sync_map_type)) {
       $cmis_content_context = array();
       $cmis_content_context['file'] = array('mime' => $cmis_object->properties['cmis:contentStreamMimeType']);
-      _cmis_sync_drupal_node_field_value($node,
+      try {
+        _cmis_sync_drupal_node_field_value($node,
                                          $sync_map_type['content_field'],
                                          cmisapi_getContentStream($repository->repositoryId, $cmis_object->id),
                                          $cmis_content_context);
+      } catch (CMISException $e) {
+        // @todo: handle error better, there could be a lot of issues in addition to "empty" bodies, check for error codes other than 404  
+        watchdog('cmis_sync_cmis', "Error retrieving content for node #@nid - @title - @code - @message", array('@nid'=>$node->nid, '@title'=>$node->title, '@code'=>$e->getCode(), '@message'=>$e->getMessage() ), WATCHDOG_WARNING  );
+      }
+      
     }
     
     // call hook_sync_cmis_drupal_prepare() hooks