diff --git a/src/libply/ply-command-parser.c b/src/libply/ply-command-parser.c
index e8122983..74c566ab 100644
--- a/src/libply/ply-command-parser.c
+++ b/src/libply/ply-command-parser.c
@@ -292,6 +292,9 @@ ply_command_get_option (ply_command_t *command,
       node = next_node;
     }
 
+  if (node == NULL)
+      return NULL;
+
   return option;
 }