diff --git a/drupal/sites/all/modules/contrib/openlayers/modules/openlayers_cck/openlayers_cck.module b/drupal/sites/all/modules/contrib/openlayers/modules/openlayers_cck/openlayers_cck.module
index 6dd5d7b..1125a27 100644
--- a/drupal/sites/all/modules/contrib/openlayers/modules/openlayers_cck/openlayers_cck.module
+++ b/drupal/sites/all/modules/contrib/openlayers/modules/openlayers_cck/openlayers_cck.module
@@ -197,9 +197,17 @@ function openlayers_cck_field($op, &$node, $field, &$items, $teaser, $page) {
       // Check if field is valid WKT format
       foreach ($items as $delta => $value) {
         // @@TODO: validate WKT
+        
+        // if the field is required, prevent the submission of empty geo 
+        // collections, which break maps
+        if ($field['required']) {
+          if ($value[$field['type']] == 'GEOMETRYCOLLECTION()') {
+            form_set_error($field['field_name'], t('@name is required.', 
+              array('@name' => $field['widget']['label'])));
+          }
+        }
       }
       break;
-
   }
 }