diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php
index cf70a603ac..2aa5da116e 100644
--- a/lib/private/AppFramework/Utility/SimpleContainer.php
+++ b/lib/private/AppFramework/Utility/SimpleContainer.php
@@ -97,7 +97,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
 						return $this->query($resolveName);
 					} catch (QueryException $e2) {
 						// don't lose the error we got while trying to query by type
-						throw new QueryException($e2->getMessage(), $e2->getCode(), $e);
+						throw new QueryException($e2->getMessage(), (int) $e2->getCode(), $e);
 					}
 				}
 
diff --git a/lib/private/Console/Application.php b/lib/private/Console/Application.php
index 10c578f41e..9b1cc57aed 100644
--- a/lib/private/Console/Application.php
+++ b/lib/private/Console/Application.php
@@ -221,7 +221,11 @@ class Application {
 				$c = \OC::$server->query($command);
 			} catch (QueryException $e) {
 				if (class_exists($command)) {
-					$c = new $command();
+					try {
+						$c = new $command();
+					} catch (\ArgumentCountError $e2) {
+						throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e);
+					}
 				} else {
 					throw new \Exception("Console command '$command' is unknown and could not be loaded");
 				}