diff --git a/models/behaviors/geocodable.php b/models/behaviors/geocodable.php
index f153f91..37b0af9 100644
--- a/models/behaviors/geocodable.php
+++ b/models/behaviors/geocodable.php
@@ -270,8 +270,10 @@ public function geocode($model, $address, $save = true) {
 			$data[$model->alias][$settings['fields']['latitude']] = $coordinates[0];
 			$data[$model->alias][$settings['fields']['longitude']] = $coordinates[1];
 
-			$model->create();
-			$model->save($data);
+			if (!empty($data[$model->alias][$settings['fields']['state']])) {
+				$model->create();
+				$model->save($data);
+			}
 		}
 
 		return $coordinates;
diff --git a/views/helpers/geomap.php b/views/helpers/geomap.php
index 8d7a813..d7b1805 100644
--- a/views/helpers/geomap.php
+++ b/views/helpers/geomap.php
@@ -44,7 +44,7 @@ public function map($center = null, $markers = array(), $parameters = array()) {
 			'width' => 500,
 			'height' => 300,
 			'zoom' => 10,
-			'div' => array(),
+			'div' => array('class'=>'map'),
 			'type' => 'street',
 			'layout' => Configure::read('Geocode.layout'),
 			'layouts' => array(
@@ -79,6 +79,9 @@ public function map($center = null, $markers = array(), $parameters = array()) {
 
 		if (empty($parameters['id'])) {
 			$parameters['id'] = 'map_' . Security::hash(uniqid(time(), true));
+		}
+
+		if ($parameters['div'] !== false) {
 			$out .= $this->Html->div(
 				!empty($parameters['div']['class']) ? $parameters['div']['class'] : null,
 				'<!-- ' . $service . ' map -->',