diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7ef9c1a6..63456d5c 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -324,12 +324,6 @@ parameters:
 			count: 1
 			path: src/Cli/migration_logic.php
 
-		-
-			message: '#^Method XcVm\\Core\\Auth\\AuthRepository\:\:getHMACById\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Core/Auth/AuthRepository.php
-
 		-
 			message: '#^Parameter \#2 \$replace of function str_replace expects array\<string\>\|string, array\<int, int\|string\> given\.$#'
 			identifier: argument.type
@@ -354,18 +348,6 @@ parameters:
 			count: 1
 			path: src/Core/Auth/Authenticator.php
 
-		-
-			message: '#^Method XcVm\\Core\\Database\\Database\:\:escape\(\) should return string\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Core/Database/Database.php
-
-		-
-			message: '#^Method XcVm\\Core\\Database\\Database\:\:last_insert_id\(\) should return int\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Core/Database/Database.php
-
 		-
 			message: '#^Negated boolean expression is always false\.$#'
 			identifier: booleanNot.alwaysFalse
@@ -408,12 +390,6 @@ parameters:
 			count: 1
 			path: src/Core/Parsing/StringWalker.php
 
-		-
-			message: '#^Method XcVm\\Core\\Parsing\\StringWalker\:\:getEdges\(\) should return array\<string\> but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Core/Parsing/StringWalker.php
-
 		-
 			message: '#^Offset 0 on array\{string, int\<\-1, max\>\} in isset\(\) always exists and is not nullable\.$#'
 			identifier: isset.offset
@@ -564,42 +540,12 @@ parameters:
 			count: 1
 			path: src/Domain/Epg/EPG.php
 
-		-
-			message: '#^Method XcVm\\Domain\\Epg\\EpgService\:\:getById\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Domain/Epg/EpgService.php
-
-		-
-			message: '#^Method XcVm\\Domain\\Epg\\EpgService\:\:getProgramme\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Domain/Epg/EpgService.php
-
 		-
 			message: '#^Method XcVm\\Domain\\Security\\BlocklistService\:\:checkISP\(\) should return bool but returns int\.$#'
 			identifier: return.type
 			count: 2
 			path: src/Domain/Security/BlocklistService.php
 
-		-
-			message: '#^Method XcVm\\Domain\\Security\\BlocklistService\:\:getISPById\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Domain/Security/BlocklistService.php
-
-		-
-			message: '#^Method XcVm\\Domain\\Security\\BlocklistService\:\:getRTMPIPById\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Domain/Security/BlocklistService.php
-
-		-
-			message: '#^Method XcVm\\Domain\\Security\\BlocklistService\:\:getUserAgentById\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Domain/Security/BlocklistService.php
-
 		-
 			message: '#^Method XcVm\\Domain\\Security\\BlocklistService\:\:isProxy\(\) should return bool but returns null\.$#'
 			identifier: return.type
@@ -1068,30 +1014,12 @@ parameters:
 			count: 1
 			path: src/Domain/User/TicketRepository.php
 
-		-
-			message: '#^Method XcVm\\Domain\\User\\UserRepository\:\:getAuthUserByCredentials\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 2
-			path: src/Domain/User/UserRepository.php
-
 		-
 			message: '#^Method XcVm\\Domain\\User\\UserRepository\:\:getE2Info\(\) should return array\|null but returns false\.$#'
 			identifier: return.type
 			count: 1
 			path: src/Domain/User/UserRepository.php
 
-		-
-			message: '#^Method XcVm\\Domain\\User\\UserRepository\:\:getLineById\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Domain/User/UserRepository.php
-
-		-
-			message: '#^Method XcVm\\Domain\\User\\UserRepository\:\:getRegisteredUserById\(\) should return array\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: src/Domain/User/UserRepository.php
-
 		-
 			message: '#^Method XcVm\\Domain\\User\\UserRepository\:\:getStreamingUserInfo\(\) should return array\|null but returns false\.$#'
 			identifier: return.type
diff --git a/src/Core/Auth/AuthRepository.php b/src/Core/Auth/AuthRepository.php
index bb385e3c..4bcb9c53 100644
--- a/src/Core/Auth/AuthRepository.php
+++ b/src/Core/Auth/AuthRepository.php
@@ -180,6 +180,7 @@ class AuthRepository {
 		if ($db->num_rows() == 1) {
 			return $db->get_row();
 		}
+		return null;
 	}
 
 	// ──────────────────────────────────────────────
diff --git a/src/Core/Database/Database.php b/src/Core/Database/Database.php
index 8f901848..ca7debb9 100644
--- a/src/Core/Database/Database.php
+++ b/src/Core/Database/Database.php
@@ -362,6 +362,7 @@ class Database {
 		if ($this->dbh) {
 			return $this->dbh->quote($string);
 		}
+		return null;
 	}
 
 	/**
@@ -389,6 +390,7 @@ class Database {
 			$mysql_insert_id = $this->dbh->lastInsertId();
 			return (empty($mysql_insert_id) ? 0 : $mysql_insert_id);
 		}
+		return null;
 	}
 
 	/**
diff --git a/src/Core/Parsing/StringWalker.php b/src/Core/Parsing/StringWalker.php
index 57040228..5d06e2d6 100644
--- a/src/Core/Parsing/StringWalker.php
+++ b/src/Core/Parsing/StringWalker.php
@@ -112,7 +112,7 @@ class StringWalker implements ParserInterface {
 	/**
 	 * Extract XML compatible tag head and tail
 	 * @param  string $element XML element
-	 * @return string[] 0 => Opening tag, 1 => Closing tag
+	 * @return string[]|null 0 => Opening tag, 1 => Closing tag (null if no tag matches)
 	 */
 	protected function getEdges($element) {
 		foreach ($this->options['tags'] as $tag) {
@@ -122,6 +122,7 @@ class StringWalker implements ParserInterface {
 				return $tag;
 			}
 		}
+		return null;
 	}
 
 	/**
diff --git a/src/Domain/Epg/EpgService.php b/src/Domain/Epg/EpgService.php
index 6d63c12c..bdbeeeb0 100644
--- a/src/Domain/Epg/EpgService.php
+++ b/src/Domain/Epg/EpgService.php
@@ -135,6 +135,7 @@ class EpgService {
 		if ($db->num_rows() == 1) {
 			return $db->get_row();
 		}
+		return null;
 	}
 
 	/**
@@ -225,6 +226,7 @@ class EpgService {
 		if (isset($rData[$rProgrammeID])) {
 			return $rData[$rProgrammeID];
 		}
+		return null;
 	}
 
 	/**
diff --git a/src/Domain/Security/BlocklistService.php b/src/Domain/Security/BlocklistService.php
index 5d3bb5d5..270069d0 100644
--- a/src/Domain/Security/BlocklistService.php
+++ b/src/Domain/Security/BlocklistService.php
@@ -611,6 +611,7 @@ class BlocklistService {
 		} else {
 			return $db->get_row();
 		}
+		return null;
 	}
 
 	/**
@@ -627,6 +628,7 @@ class BlocklistService {
 		} else {
 			return $db->get_row();
 		}
+		return null;
 	}
 
 	/**
@@ -662,5 +664,6 @@ class BlocklistService {
 		} else {
 			return $db->get_row();
 		}
+		return null;
 	}
 }
diff --git a/src/Domain/User/UserRepository.php b/src/Domain/User/UserRepository.php
index bc5511c0..d80782b4 100644
--- a/src/Domain/User/UserRepository.php
+++ b/src/Domain/User/UserRepository.php
@@ -62,6 +62,7 @@ class UserRepository {
 				return $rRow;
 			}
 		}
+		return null;
 	}
 
 	/**
@@ -168,6 +169,7 @@ class UserRepository {
 		} else {
 			return $db->get_row();
 		}
+		return null;
 	}
 
 	/**
@@ -184,6 +186,7 @@ class UserRepository {
 		} else {
 			return $db->get_row();
 		}
+		return null;
 	}
 
 	/**