diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
index 05dd949..47abda9 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
@@ -23,10 +23,11 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/presentation/Html.inc");
 
     $oPatternCustom = & new PatternCustom();
-    if(isset($fDocFieldID)) {
-        // post back on DocField select from manual edit page
-        $oPatternCustom->setHtml(getSelectMetaDataPage($fDocFieldID,$fMetaDataID));
-        $main->setFormAction($_SERVER["PHP_SELF"] . "?fSelected=1");
+    if(isset($fDocFieldID)) {        
+	        // post back on DocField select from manual edit page
+	        $oPatternCustom->setHtml(getSelectMetaDataPage($fDocFieldID,$fMetaDataID));
+	        $main->setFormAction($_SERVER["PHP_SELF"] . "?fSelected=1");	    
+        	//$oPatternCustom->setHtml(getEditMetaDataFailPage($fDocFieldID));        
     } else {
         // if nothing happens...just reload edit page
         $oPatternCustom->setHtml(getSelectFieldPage(null));
@@ -34,8 +35,9 @@ if (checkSession()) {
     }
 
     if(isset($fSelected)) {
-        $oPatternCustom->setHtml(getEditMetaDataPage($fDocFieldID,$fMetaDataID));
-        $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
+        
+	        $oPatternCustom->setHtml(getEditMetaDataPage($fDocFieldID,$fMetaDataID));
+	        $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");       
     }
 
     if(isset($fForStore)) {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
index 2e20b78..12d0e14 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
@@ -1,5 +1,19 @@
 <?php
 
+function getEditMetaDataFailPage($iDocFieldID){
+    global $default;
+    
+
+    $sToRender .= renderHeading("Edit Document Field Lookup");
+    $sToRender .= "<table width=300>\n";
+    $sToRender .= "<tr><td>Document has no lookups to edit.</td></tr>\n";
+    $sToRender .= "<tr>\n";
+    $sToRender .= "<td></td><td><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+    $sToRender .= "</tr>\n";    
+    $sToRender .= "</table>\n";
+
+    return $sToRender;
+}
 // if its the manual edit page..then display normally
 function getSelectFieldPage($iDocFieldID) {
     global $default;
@@ -39,6 +53,8 @@ function getSelectMetaDataPage($iDocFieldID, $iMetaDataID) {
         $oMetaData = MetaData::get($iMetaDataID);
     }
 
+	getMetaDataDisplay($oMetaData,$iDocFieldID);
+
     $sToRender .= renderHeading("Edit Document Field Lookup");
     $sToRender .= "<table>\n";
     $sToRender .= "<tr>Please Select the Document Field Lookup you wish to Edit</tr>\n";