diff --git a/sites/all/modules/linkimagefield/linkimagefield.module b/sites/all/modules/linkimagefield/linkimagefield.module
index 72f17e0..25a272e 100644
--- a/sites/all/modules/linkimagefield/linkimagefield.module
+++ b/sites/all/modules/linkimagefield/linkimagefield.module
@@ -273,7 +273,9 @@ function theme_linkimagefield_formatter($element) {
 }
 
 function theme_linkimagefield_image($file, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE, $url = '') {
-  return '<a href="'. $url .'">'. theme('imagefield_image', $file, $alt, $title, $attributes, $getsize) .'</a>';
+    $prefix = $url ? '<a href="'. $url .'">' : null;
+    $suffix = $url ? '</a>' : null;
+  return $prefix . theme('imagefield_image', $file, $alt, $title, $attributes, $getsize) . $suffix;
 }
 
 function theme_linkimagefield_imagecache($element) {
@@ -302,7 +304,8 @@ function theme_linkimagefield_imagecache($element) {
   if ($preset = imagecache_preset_by_name($presetname)) {
     $item['filepath'] = $item['fid'] == 'upload' ? $item['preview'] : $item['filepath'];
     $imagetag = theme('imagecache', $presetname, $item['filepath'], $alt, $title);
-    return l($imagetag, $url, array('attributes' => array('class' => $class), 'html' => TRUE));
+    $output = empty($url) ? $imagetag : l($imagetag, $url, array('attributes' => array('class' => $class), 'html' => TRUE));
+    return $output;
   }
   return '<!-- linkimagefield formatter imagecache preset('. $presetname .') not found! -->';