diff --git a/modules/metaedit/lib/MetaEditor.php b/modules/metaedit/lib/MetaEditor.php
index 73049f5034710f85b6c492e425cb10cc09287b9c..161cbbb7bbe4b8d874947c5712f7474b9728da75 100644
--- a/modules/metaedit/lib/MetaEditor.php
+++ b/modules/metaedit/lib/MetaEditor.php
@@ -104,6 +104,7 @@ class sspmod_metaedit_MetaEditor {
 		if (array_key_exists($key, $metadata)) {
 			$value = htmlspecialchars($metadata[$key]);
 		}
+		#echo '<tr><td><pre>'; print_r($metadata); echo '</pre></td></tr>';
 		
 		if ($textarea) {
 			return '<tr><td class="name">' . $name . '</td><td class="data">
@@ -119,7 +120,12 @@ class sspmod_metaedit_MetaEditor {
 	protected function endpointField($metadata, $key, $name, $textarea = FALSE) {
 		$value = '';
 		if (array_key_exists($key, $metadata)) {
-			$value = htmlspecialchars($metadata[$key]['Location']);
+			if (is_array($metadata[$key])) {
+				$value = htmlspecialchars($metadata[$key]['Location']);	
+			} else {
+				$value = htmlspecialchars($metadata[$key]);	
+			}
+			
 		}
 		
 		if ($textarea) {