diff --git a/src/App/Core/Command_Parser.php b/src/App/Core/Command_Parser.php
index a00f1ac..1f3f622 100644
--- a/src/App/Core/Command_Parser.php
+++ b/src/App/Core/Command_Parser.php
@@ -67,7 +67,6 @@ public function buildCommandData(Request $Request, Application_Object $Applicati
 				$cli_params[$arg->title] = $arg->default_value;
 			}
 		}
-
 		return [$command, $cli_params];
 	}
 
diff --git a/src/App/Core/Request_Handler.php b/src/App/Core/Request_Handler.php
index 92b959c..65dd28f 100644
--- a/src/App/Core/Request_Handler.php
+++ b/src/App/Core/Request_Handler.php
@@ -59,6 +59,14 @@ protected function getArgumentsPassed(array $argv): array {
 			return $args_out;
 		}
 
+		if (strpos($argv_mutated[0], '-') === false) {
+			$argv_mutated = array_slice($argv_mutated, 1, (count($argv) - 1));
+		}
+
+		if(empty($argv_mutated)) {
+			return $args_out;
+		}
+
 		$current_arg = NULL;
 		$ignore_key  = FALSE;
 		for ($key = 0; $key <= (count($argv_mutated) - 1); $key++) {
diff --git a/src/App/Tools/Help.php b/src/App/Tools/Help.php
index 374e08e..7639cb1 100644
--- a/src/App/Tools/Help.php
+++ b/src/App/Tools/Help.php
@@ -81,9 +81,9 @@ public function buildCommandHelpOutput(Command_Object $command, Application_Obje
 		foreach($command->args as $arg) {
 			$value  = $arg->is_flag ? '' : '=[VALUE]';
 			$rows[] = [
-				'--' . $arg->long_name . $value, 
-				'-' . $arg->short_name . $value, 
-				$arg->help, 
+				isset($arg->long_name) ? '--' . $arg->long_name . $value : '', 
+				isset($arg->short_name) ? '-' . $arg->short_name . $value : '', 
+				isset($arg->help) ? $arg->help : '', 
 				$arg->required ? 'True' : 'False', 
 				$arg->is_flag ? 'True' : 'False',
 			];