Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.30.2.6.2.73
diff -u -r1.30.2.6.2.73 imagefield.module
--- imagefield.module	14 Mar 2009 23:51:11 -0000	1.30.2.6.2.73
+++ imagefield.module	14 Mar 2009 23:58:18 -0000
@@ -931,14 +931,20 @@
  * Implementation of hook_field_formatter().
  */
 function imagefield_field_formatter($field, $item, $formatter, $node = null) {
+  // Use a default image if available.
   if (empty($item['fid']) && $field['use_default_image']) {
     $item = $field['default_image'];
   }
-  // If there is no image on the database, use default.
-  if (empty($item['filepath'])) {
+  // If a filepath isn't loaded, see if we can load one.
+  if (!empty($item['fid']) && empty($item['filepath'])) {
     $item = array_merge($item, _imagefield_file_load($item['fid']));
   }
 
+  // If we don't have a filepath at this point, no point in continuing.
+  if (empty($item['filepath'])) {
+    return '';
+  }
+
   $parts = explode('_', $formatter);
   $style = array_pop($parts);
   $fieldtype = implode('_', $parts);