diff --git a/filefieldmp3player/filefieldmp3player.module b/filefieldmp3player/filefieldmp3player.module
index cd99ccc..7e21e7e 100755
--- a/filefieldmp3player/filefieldmp3player.module
+++ b/filefieldmp3player/filefieldmp3player.module
@@ -53,16 +53,13 @@ function theme_filefieldmp3player_formatter_mp3player($element) {
     return;
   }
   
-  if(variable_get('mp3player_description', 'description') == 'id3' && module_exists(getid3) && getid3_load() == TRUE) {
+  // Parse the file for ID3 information if the module to do so is enabled
+  if (module_exists('getid3') && getid3_load() == TRUE) {
     $id3 = getid3_analyze($item['filepath']);
-
-    $title = $info['tags']['id3v2']['title'][0];
-    $artist = $info['tags']['id3v2']['artist'][0];
-    $album = $info['tags']['id3v2']['album'][0];
-    $year = $info['tags']['id3v2']['year'][0];
-    $track = $info['tags']['id3v2']['track'][0];
-    $genre = $info['tags']['id3v2']['genre'][0];
-    
+  }
+  
+  // How should the description be output?
+  if(variable_get('mp3player_description', 'description') == 'id3' && !empty($id3)) {
     $description = theme('filefieldmp3player_description', $id3);
   }
   else if(isset($item['data']['description']) && is_array($item['data'])) {
@@ -82,7 +79,9 @@ function theme_filefieldmp3player_formatter_mp3player($element) {
   if (!empty($item['filepath'])) {
     if($item['filemime'] == 'audio/mpeg' || $item['filemime'] == 'audio/x-mpeg' || $item['filemime'] == 'audio/mp3' || $item['filemime'] == 'audio/x-mp3' || $item['filemime'] == 'audio/mpeg3' || $item['filemime'] == 'audio/x-mpeg3' || $item['filemime'] == 'audio/mpg' || $item['filemime'] == 'audio/x-mpg' || $item['filemime'] == 'audio/mpegaudi') {
       //MP3 files get special treatment.
-      return theme('mp3player', $player, file_create_url($item['filepath']), NULL, NULL, $description);
+      $title = (!empty($id3)) ? $id3['tags']['id3v2']['title'][0] : NULL;
+      $artist = (!empty($id3)) ? $id3['tags']['id3v2']['artist'][0] : NULL;
+      return theme('mp3player', $player, file_create_url($item['filepath']), $title, $artist, $description);
     }
     else {
       // Fall back to filefield's default behavior.