diff --git a/src/openrct2/cmdline/CommandLine.cpp b/src/openrct2/cmdline/CommandLine.cpp
index 2337744927..2f613905e7 100644
--- a/src/openrct2/cmdline/CommandLine.cpp
+++ b/src/openrct2/cmdline/CommandLine.cpp
@@ -568,6 +568,12 @@ extern "C"
         argEnumerator.TryPop();
 
         const CommandLineCommand * command = CommandLine::FindCommandFor(CommandLine::RootCommands, &argEnumerator);
+
+	if (command == nullptr)
+	{
+	return EXITCODE_FAIL;
+	}
+
         if (command->Options != nullptr)
         {
             auto argEnumeratorForOptions = CommandLineArgEnumerator(argEnumerator);
@@ -576,6 +582,7 @@ extern "C"
                 return EXITCODE_FAIL;
             }
         }
+
         if (command == CommandLine::RootCommands && command->Func == nullptr)
         {
             return CommandLine::HandleCommandDefault();