diff --git a/awesome-message.1.txt b/awesome-message.1.txt
index efe83404c..f50101e7f 100644
--- a/awesome-message.1.txt
+++ b/awesome-message.1.txt
@@ -30,7 +30,7 @@ OPTIONS
 -y ycoord::
     Set y coordinate of the window.
 -d delay::
-    Close the window after <delay> seconds.
+    Close the window after <delay> seconds. Must be an integer greater than 0.
 <message>::
     Print this message in the window.
 <icon>::
diff --git a/awesome-message.c b/awesome-message.c
index a84d0ea9c..b68bdd30d 100644
--- a/awesome-message.c
+++ b/awesome-message.c
@@ -144,7 +144,8 @@ main(int argc, char **argv)
         switch(opt)
         {
 	  case 'd':
-	    delay = atoi(optarg);
+	    if((delay = atoi(optarg)) <= 0)
+                delay = 1;
 	    break;
           case 'v':
             eprint_version(PROGNAME);