Merge branch 'master' of github.com:Islandora/islandora

plugins/Exiftool.inc

@@ -33,7 +33,7 @@ class Exiftool {
   function displayMetadata() { 
     $output='';
     $exifDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('EXIF'));
-    
+    if ($exifDom != NULL) {
       $description = $exifDom->getElementsByTagNameNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#','Description');
       if ($description->length > 0) { 
 	$description=$description->item(0);
@@ -57,6 +57,7 @@ class Exiftool {
 	);
 	$output  = theme('fieldset', $fieldset);
       }
+    }
     return $output;
   }