diff --git a/build/generate-registry-annotations.php b/build/generate-registry-annotations.php
index 6b8fb00059..e6aa0432e1 100644
--- a/build/generate-registry-annotations.php
+++ b/build/generate-registry-annotations.php
@@ -49,6 +49,9 @@ if(count($argv) !== 2){
 	exit(1);
 }
 
+/**
+ * @phpstan-param \ReflectionClass<*> $class
+ */
 function makeTypehint(string $namespaceName, \ReflectionClass $class) : string{
 	return $class->getNamespaceName() === $namespaceName ? $class->getShortName() : '\\' . $class->getName();
 }
diff --git a/src/utils/RegistryTrait.php b/src/utils/RegistryTrait.php
index 94841016f8..9662b71ada 100644
--- a/src/utils/RegistryTrait.php
+++ b/src/utils/RegistryTrait.php
@@ -166,6 +166,7 @@ trait RegistryTrait{
 					throw new \Error("Wrong enum type for overloaded registry member " . self::class . "::" . mb_strtoupper($name) . "($overloadInfo->enumClass)");
 				}
 				$memberName = $overloadInfo->enumToMemberMap[$enum->name];
+				assert(self::$members !== null);
 				return self::preprocessMember(self::$members[$memberName]);
 			}