2 files changed, 5 insertions, 1 deletions
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index c488bbd4..970be5ac 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -88,6 +88,10 @@ class exif_Core {
     $record = ORM::factory("exif_record")
       ->where("item_id", $item->id)
       ->find();
+    if (!$record->loaded) {
+      return array();
+    }
+
     $definitions = self::_keys();
     $keys = unserialize($record->data);
     foreach ($keys as $key => $value) {
diff --git a/modules/exif/tests/Exif_Test.php b/modules/exif/tests/Exif_Test.php
index aa76d036..312ed535 100644
--- a/modules/exif/tests/Exif_Test.php
+++ b/modules/exif/tests/Exif_Test.php
@@ -22,7 +22,7 @@ class Exif_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     $photo = photo::create(
-      $root, DOCROOT . "modules/exif/tests/data/image.jpg", "$rand.jpg", $rand, $rand);
+      $root, MODPATH . "exif/tests/data/image.jpg", "$rand.jpg", $rand, $rand);
 
     $expected = array(
       array("caption" => "Camera Maker", "value" => "Pentax Corporation"),