diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php
index d394dfce9..f02cb9ef9 100644
--- a/src/App/BaseURL.php
+++ b/src/App/BaseURL.php
@@ -264,6 +264,10 @@ class BaseURL
 		$this->sslPolicy = $this->config->get('system', 'ssl_policy') ?? static::DEFAULT_SSL_SCHEME;
 		$this->url       = $this->config->get('system', 'url');
 
+		if (empty($this->hostname) || empty($this->url)) {
+			throw new \Exception('Invalid config - Missing system.url or config.hostname');
+		}
+
 		$this->determineSchema();
 	}
 
diff --git a/src/App/Request.php b/src/App/Request.php
index 675841ae7..d61303d5d 100644
--- a/src/App/Request.php
+++ b/src/App/Request.php
@@ -74,7 +74,7 @@ class Request
 	public function __construct(IManageConfigValues $config, array $server = [])
 	{
 		$this->remoteAddress = $this->determineRemoteAddress($config, $server);
-		$this->requestId = $server[static::DEFAULT_REQUEST_ID_HEADER] ?? System::createGUID(8);
+		$this->requestId = $server[static::DEFAULT_REQUEST_ID_HEADER] ?? System::createGUID(8, false);
 	}
 
 	/**