Index: gazetteer-functions.sql
===================================================================
--- gazetteer-functions.sql     (revision 18824)
+++ gazetteer-functions.sql     (working copy)
@@ -1361,7 +1361,8 @@
       RETURN NULL;
     END IF;
     NEW.geometry := ST_buffer(NEW.geometry,0);
-    IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN
+    RAISE NOTICE 'Value: % Type: %' , ST_Centroid(NEW.geometry), geometrytype(ST_Centroid(NEW.geometry));
+    IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR geometrytype(ST_Centroid(NEW.geometry)) = 'GEOMETRYCOLLECTION' OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN
       RAISE WARNING 'Invalid geometary, rejecting: % %', NEW.osm_type, NEW.osm_id;
       RETURN NULL;
     END IF;