diff --git a/src/main/kotlin/net/leanix/githubagent/services/GitHubGraphQLService.kt b/src/main/kotlin/net/leanix/githubagent/services/GitHubGraphQLService.kt
index 245bf5e..6be497c 100644
--- a/src/main/kotlin/net/leanix/githubagent/services/GitHubGraphQLService.kt
+++ b/src/main/kotlin/net/leanix/githubagent/services/GitHubGraphQLService.kt
@@ -95,15 +95,12 @@ class GitHubGraphQLService(
             client.execute(query)
         }
 
-        return if (result.errors != null && result.errors!!.isNotEmpty()) {
+        if (!result.errors.isNullOrEmpty()) {
             logger.error("Error getting file content: ${result.errors}")
             throw GraphQLApiException(result.errors!!)
-        } else {
-            (
-                result.data!!.repository!!.manifestFile
-                    as net.leanix.githubagent.graphql.`data`.getrepositorymanifestcontent.Blob
-                ).text.toString()
         }
+
+        return (result.data?.repository?.manifestFile as? RepositoryManifestBlob)?.text
     }
 
     private fun buildGitHubGraphQLClient(
@@ -114,3 +111,5 @@ class GitHubGraphQLService(
             builder = WebClient.builder().defaultHeaders { it.setBearerAuth(token) }
         )
 }
+
+typealias RepositoryManifestBlob = net.leanix.githubagent.graphql.`data`.getrepositorymanifestcontent.Blob