diff --git a/CHANGELOG.md b/CHANGELOG.md
index d08dfcb..9c93c10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.31.6
+
+* Issue an error message in tile-join if minzoom is greater than maxzoom
+
 ## 1.31.5
 
 * Add options to change the tilestats limits
diff --git a/main.cpp b/main.cpp
index 63b69e4..3abb594 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3046,7 +3046,7 @@ int main(int argc, char **argv) {
 	}
 
 	if (minzoom > maxzoom) {
-		fprintf(stderr, "minimum zoom -Z cannot be greater than maxzoom -z\n");
+		fprintf(stderr, "%s: Minimum zoom -Z%d cannot be greater than maxzoom -z%d\n", argv[0], minzoom, maxzoom);
 		exit(EXIT_FAILURE);
 	}
 
diff --git a/tile-join.cpp b/tile-join.cpp
index 34c4bf4..177fc5f 100644
--- a/tile-join.cpp
+++ b/tile-join.cpp
@@ -1030,6 +1030,11 @@ int main(int argc, char **argv) {
 		usage(argv);
 	}
 
+	if (minzoom > maxzoom) {
+		fprintf(stderr, "%s: Minimum zoom -Z%d cannot be greater than maxzoom -z%d\n", argv[0], minzoom, maxzoom);
+		exit(EXIT_FAILURE);
+	}
+
 	if (out_mbtiles != NULL) {
 		if (force) {
 			unlink(out_mbtiles);
diff --git a/version.hpp b/version.hpp
index 2829d01..6d57807 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v1.31.5"
+#define VERSION "v1.31.6"
 
 #endif