diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/Point.java b/modules/core/src/main/java/org/locationtech/jts/geom/Point.java
index cbe145416f..1a0c54b3f1 100644
--- a/modules/core/src/main/java/org/locationtech/jts/geom/Point.java
+++ b/modules/core/src/main/java/org/locationtech/jts/geom/Point.java
@@ -110,7 +110,10 @@ public double getY() {
   }
 
   public Coordinate getCoordinate() {
-    return coordinates.size() != 0 ? coordinates.getCoordinate(0): null;
+    if (coordinates.size() == 0) {
+      throw new IllegalStateException("getCoordinate called on empty Point");
+    }
+    return coordinates.getCoordinate(0);
   }
 
   public String getGeometryType() {