diff --git a/src/cli.cpp b/src/cli.cpp
index 56dbf8e..5c7d6be 100644
--- a/src/cli.cpp
+++ b/src/cli.cpp
@@ -183,6 +183,10 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
 	    }
             i++;
         } else if (arg == "-p" || arg == "--productid") {
+	    if (i == argc -1) {
+                options->error = true;
+                break;
+	    }
             options->productid = argv[i+1];
             i++;
         } else if (arg == "-V" || arg == "--validate") {