diff --git a/site/views/profile/tmpl/default.php b/site/views/profile/tmpl/default.php
index 5e7481a..313bdf7 100644
--- a/site/views/profile/tmpl/default.php
+++ b/site/views/profile/tmpl/default.php
@@ -108,13 +108,12 @@
     <div class="row-fluid">
         <div class="span12 well">
 			<?php // Custom fields ?>
-            <?php if(count($this->item->jcfields)): ?>
+            <?php if(isset($this->item->jcfields) && count($this->item->jcfields)): ?>
             <div class="row-fluid">
                 <hr>
                 <h2><?php echo JText::_('COM_DD_GMAPS_LOCATIONS_CUSTOMFIELDS'); ?></h2>
                 <hr>
             </div>
-            <?php endif; ?>
 			<?php foreach ($this->item->jcfields as $jcfield): ?>
                 <div class="row-fluid">
                     <div class="span6">
@@ -125,6 +124,7 @@
                     </div>
                 </div>
 			<?php endforeach; ?>
+            <?php endif; ?>
 
 			<?php // Description ?>
             <div class="row-fluid">
diff --git a/site/views/profile/view.html.php b/site/views/profile/view.html.php
index ab4c461..ba3f100 100644
--- a/site/views/profile/view.html.php
+++ b/site/views/profile/view.html.php
@@ -49,9 +49,15 @@ function display($tpl = null)
 		$fields = FieldsHelper::getFields('com_dd_gmaps_locations.location', $this->item, true);
 
 		// Assigne custom fields to $this->item->jcfields
-		foreach ($fields as $key => $field)
+		if($fields)
 		{
-			$this->item->jcfields[$field->id] = $field;
+			foreach ($fields as $key => $field)
+			{
+				if($field->value != '')
+				{
+					$this->item->jcfields[$field->id] = $field;
+				}
+			}
 		}
 
 		if (empty($this->item))