--- classes/ezfsolrdocumentfieldgmaplocation.php	2011-04-20 16:50:54.000000000 +0200
+++ classes/ezfsolrdocumentfieldgmaplocation.php.new	2011-04-20 16:50:20.000000000 +0200
@@ -33,12 +33,15 @@
         $data[self::getFieldName( $contentClassAttribute, self::DEFAULT_SUBATTRIBUTE )] = $this->ContentObjectAttribute->attribute( 'content' )->attribute( 'address' );
         $longitude = $this->ContentObjectAttribute->attribute( 'content' )->attribute( 'longitude' );
         $latitude = $this->ContentObjectAttribute->attribute( 'content' )->attribute( 'latitude' );
-        $data[self::getFieldName( $contentClassAttribute, 'longitude' )] = $longitude;
-        $data[self::getFieldName( $contentClassAttribute, 'latitude' )] = $latitude;
-        $data[self::getFieldName( $contentClassAttribute, 'coordinates' )] = $longitude . ',' . $latitude;
-        //almost the same input format, Solr will take care of the conversion to a geohash string
-        //disabled for now, need to update Solr.war first
-        //$data[self::getFieldName( $contentClassAttribute, 'geohash' )] = $longitude . ' ' . $latitude;
+        if ( ! empty( $latitude ) && ! empty( $longitude ) )
+        {
+            $data[self::getFieldName( $contentClassAttribute, 'longitude' )] = $longitude;
+            $data[self::getFieldName( $contentClassAttribute, 'latitude' )] = $latitude;
+            $data[self::getFieldName( $contentClassAttribute, 'coordinates' )] = $longitude . ',' . $latitude;
+            //almost the same input format, Solr will take care of the conversion to a geohash string
+            //disabled for now, need to update Solr.war first
+            //$data[self::getFieldName( $contentClassAttribute, 'geohash' )] = $longitude . ' ' . $latitude;
+        }
         return $data;
 
     }