diff --git a/includes/entity.wrapper.inc b/includes/entity.wrapper.inc
index 860d2c3..800a310 100644
--- a/includes/entity.wrapper.inc
+++ b/includes/entity.wrapper.inc
@@ -80,8 +80,24 @@ abstract class EntityMetadataWrapper {
    */
   public function value(array $options = array()) {
     if (!$this->dataAvailable() && isset($this->info['parent'])) {
-      throw new EntityMetadataWrapperException('Missing data values.');
-    }
+	  if (module_exists('devel')) {
+        $callers = debug_backtrace();
+        
+        $format = 'Missing data values on type "%s" property "%s" with ID "%s" from %s in %s line %s';
+        
+        $name = $this->info['name'];
+        $parent_type = $this->info['parent']->type;
+        $parent_id = var_export($this->info['parent']->id, TRUE);
+        $function = $callers[1]['function'];
+        $file = $callers[1]['file'];
+        $line = $callers[1]['line'];
+        
+        throw new EntityMetadataWrapperException(sprintf($format, $parent_type, $name, $parent_id, $function, $file, $line));
+      }
+	  else {
+	    throw new EntityMetadataWrapperException('Missing data values.');
+	  }
+	}
     if (!isset($this->data) && isset($this->info['name'])) {
       $this->data = $this->info['parent']->getPropertyValue($this->info['name'], $this->info);
     }
