diff --git a/worker/gdalprocess/drill.go b/worker/gdalprocess/drill.go
index 46e30d09..ce3c3956 100644
--- a/worker/gdalprocess/drill.go
+++ b/worker/gdalprocess/drill.go
@@ -249,6 +249,9 @@ func envelopePolygon(hDS C.GDALDatasetH) C.OGRGeometryH {
 
 func getDrillFileDescriptor(ds C.GDALDatasetH, g C.OGRGeometryH) DrillFileDescriptor {
 	gCopy := C.OGR_G_Buffer(g, C.double(0.0), C.int(30))
+	if C.OGR_G_IsEmpty(gCopy) == C.int(1) {
+		gCopy = C.OGR_G_Clone(g)
+	}
 
 	if C.GoString(C.GDALGetProjectionRef(ds)) != "" {
 		desSRS := C.OSRNewSpatialReference(C.GDALGetProjectionRef(ds))