diff --git a/includes/handlers/getid3_metadata_handler.inc b/includes/handlers/getid3_metadata_handler.inc
index 1bbde27..71f73e5 100644
--- a/includes/handlers/getid3_metadata_handler.inc
+++ b/includes/handlers/getid3_metadata_handler.inc
@@ -5,13 +5,14 @@
  *
  * @todo: Patch file entity to provide this?
  */
-class getid3_metadata_handler extends views_handler_field_custom {
+class getid3_metadata_handler extends views_handler_field_entity {
   function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['alter']['#access'] = FALSE;
   }
   function render($values) {
-    $file = file_load($values->fid);
-    return $file->metadata;
+    if ($file = $this->get_value($values)) {
+    	return $file->metadata;
+    }
   }
 }