diff --git a/forms/LookupField.php b/forms/LookupField.php
index 9aefddf39..233d7eb61 100755
--- a/forms/LookupField.php
+++ b/forms/LookupField.php
@@ -1,6 +1,7 @@
 <?php
 
 class LookupField extends DropdownField {
+
 	/**
 	 * Returns a readonly span containing the correct value.
 	 */
@@ -11,13 +12,24 @@ class LookupField extends DropdownField {
 			else $mappedValue = $this->source->getItem($this->value);
 		}
 		
-		if(!isset($mappedValue)) $mappedValue = "<i>(none)</i>";
-		
-		if($this->value) $val = $this->dontEscape ? ($this->reserveNL?Convert::raw2xml($this->value):$this->value) : Convert::raw2xml($this->value);
-		else $val = '<i>(none)</i>';
-		$valforInput = $this->value ? Convert::raw2att($val) : "";
-		
-		return "<span class=\"readonly\" id=\"" . $this->id() . "\">$mappedValue</span><input type=\"hidden\" name=\"".$this->name."\" value=\"".$valforInput."\" />";
+		if(!$mappedValue)
+			$mappedValue = "<i>(none)</i>";
+
+		if($this->value) {
+			$val = $this->dontEscape
+				? ($this->reserveNL?Convert::raw2xml($this->value):$this->value)
+				: Convert::raw2xml($this->value);
+		} else {
+			$val = '<i>(none)</i>';
+		}
+
+		$valforInput = $this->value
+			? Convert::raw2att($val)
+			: "";
+
+		return "<span class=\"readonly\" id=\"" . $this->id() .
+			"\">$mappedValue</span><input type=\"hidden\" name=\"" . $this->name .
+			"\" value=\"" . $valforInput . "\" />";
 	}
 	function performReadonlyTransformation() {
 		return $this;