diff --git a/apps/email_common.h b/apps/email_common.h
index 9d3f304..3742b6f 100644
--- a/apps/email_common.h
+++ b/apps/email_common.h
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#define PROGNAME "emai//er v2.1.9"
+#define PROGNAME "emai//er v2.1.10"
 
 // Configuration params from EMAIL.CFG
 char cfg_server[40];         // IP of POP3 server
diff --git a/apps/rebuild.c b/apps/rebuild.c
index d88a0f6..bdb71f0 100644
--- a/apps/rebuild.c
+++ b/apps/rebuild.c
@@ -183,6 +183,11 @@ void repair_mailbox(void) {
   }
   closedir(dp);
 
+  if (maxemailnum < minemailnum) {
+    printf("** No messages in this directory\n");
+    error_exit();
+  }
+
   printf("** Will process EMAIL.%u to EMAIL.%u\n", minemailnum, maxemailnum);
   for (emailnum = minemailnum; emailnum <= maxemailnum; ++emailnum) {
     sprintf(filename, "%s/EMAIL.%u", dirname, emailnum);
diff --git a/releases/emailler-2.1.10.po b/releases/emailler-2.1.10.po
new file mode 100644
index 0000000..d1300f5
Binary files /dev/null and b/releases/emailler-2.1.10.po differ