diff --git a/i3-msg/main.c b/i3-msg/main.c
index 02e156a1..4bc3c149 100644
--- a/i3-msg/main.c
+++ b/i3-msg/main.c
@@ -180,6 +180,8 @@ int main(int argc, char *argv[]) {
             printf("i3-msg " I3_VERSION "\n");
             printf("i3-msg [-s <socket>] [-t <type>] <message>\n");
             return 0;
+        } else if (o == '?') {
+            exit(EXIT_FAILURE);
         }
     }