diff --git a/src/client/plymouth.c b/src/client/plymouth.c
index c2313368..4c95e688 100644
--- a/src/client/plymouth.c
+++ b/src/client/plymouth.c
@@ -1219,12 +1219,12 @@ main (int    argc,
         exit_code = ply_event_loop_run (state.loop);
 
 out:
-        ply_command_parser_free (state.command_parser);
-
         ply_boot_client_free (state.client);
 
         ply_event_loop_free (state.loop);
 
+        ply_command_parser_free (state.command_parser);
+
         return exit_code;
 }
 /* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-command-parser.c b/src/libply/ply-command-parser.c
index 4fec7fe2..c4cf1036 100644
--- a/src/libply/ply-command-parser.c
+++ b/src/libply/ply-command-parser.c
@@ -663,8 +663,6 @@ ply_command_parser_get_command_options (ply_command_parser_t *parser,
         va_start (args, option_name);
         ply_command_parser_get_options_for_command (parser, command, option_name, args);
         va_end (args);
-
-        ply_list_append_data (parser->available_subcommands, command);
 }
 
 static void
diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
index 6be7199e..4848580e 100644
--- a/src/plugins/splash/script/script-lib-plymouth.c
+++ b/src/plugins/splash/script/script-lib-plymouth.c
@@ -387,6 +387,10 @@ bool script_lib_plymouth_on_validate_input (script_state_t             *state,
                                             const char                 *add_text)
 {
         bool input_valid;
+
+        if (script_obj_is_null (data->script_validate_input_func))
+                return true;
+
         script_obj_t *entry_text_obj = script_obj_new_string (entry_text);
         script_obj_t *add_text_obj = script_obj_new_string (add_text);
         script_return_t ret = script_execute_object (state,