diff --git a/recipe.module b/recipe.module
index d4496e3..9cbbf9d 100644
--- a/recipe.module
+++ b/recipe.module
@@ -824,7 +824,10 @@ function theme_recipe_ingredients($variables) {
           $ingredient['name'] = l($ingredient['name'], 'node/' . $ingredient['link']);
         }
 
-        if (isset($unit_list[$ingredient['unit_key']])) {
+        if ($ingredient['unit_key'] == 'unit') {
+          $title = '';
+        }
+        elseif (isset($unit_list[$ingredient['unit_key']])) {
           // Print the singular or plural term depending on the quantity.
           $title = $ingredient['quantity'] > 1 ? $unit_list[$ingredient['unit_key']]['plural'] : $unit_list[$ingredient['unit_key']]['name'];
         }
@@ -841,7 +844,7 @@ function theme_recipe_ingredients($variables) {
         }
 
         $units = '';
-        if ( variable_get('recipe_unit_display', 0) == 0 || $ingredient['abbreviation'] == ' ') {
+        if (!empty($title) &&  (variable_get('recipe_unit_display', 0) == 0 || $ingredient['abbreviation'] == ' ')) {
           $units = '<abbr ' . drupal_attributes(array('title' => $title)) . '>' . $ingredient['abbreviation'] . '</abbr>';
         }
         else {