diff --git a/src/Socialbox/Objects/ClientRequest.php b/src/Socialbox/Objects/ClientRequest.php
index 7f61ee7..402c249 100644
--- a/src/Socialbox/Objects/ClientRequest.php
+++ b/src/Socialbox/Objects/ClientRequest.php
@@ -73,12 +73,12 @@
             return $this->requestBody;
         }
 
-        public function getClientName(): string
+        public function getClientName(): ?string
         {
             return $this->clientName;
         }
 
-        public function getClientVersion(): string
+        public function getClientVersion(): ?string
         {
             return $this->clientVersion;
         }
diff --git a/src/Socialbox/Socialbox.php b/src/Socialbox/Socialbox.php
index b9c2553..3b5c175 100644
--- a/src/Socialbox/Socialbox.php
+++ b/src/Socialbox/Socialbox.php
@@ -81,14 +81,14 @@
         private static function handleInitiateSession(ClientRequest $clientRequest): void
         {
 
-            if(!isset($requestHeaders[StandardHeaders::CLIENT_NAME->value]))
+            if(!$clientRequest->getClientName())
             {
                 http_response_code(400);
                 print('Missing required header: ' . StandardHeaders::CLIENT_NAME->value);
                 return;
             }
 
-            if(!isset($requestHeaders[StandardHeaders::CLIENT_VERSION->value]))
+            if(!$clientRequest->getClientVersion())
             {
                 http_response_code(400);
                 print('Missing required header: ' . StandardHeaders::CLIENT_VERSION->value);