diff --git a/src/disk_tool.cpp b/src/disk_tool.cpp
index 2d4b2490..2faa6cd2 100644
--- a/src/disk_tool.cpp
+++ b/src/disk_tool.cpp
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
         {
             self.options["allow_data_loss"] = "1";
         }
-        else if (argv[i][0] == '-' && argv[i][1] == '-')
+        else if (argv[i][0] == '-' && argv[i][1] == '-' && i < argc-1)
         {
             char *key = argv[i]+2;
             self.options[key] = argv[++i];