diff --git a/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php b/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
index f051d215808a3..037d8c2181dbf 100644
--- a/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
+++ b/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Autoload;
 
+use InvalidArgumentException;
 use Magento\Framework\Autoload\AutoloaderInterface;
 
 /**
@@ -23,7 +24,7 @@ class AutoloaderRegistry
      * @param AutoloaderInterface $newAutoloader
      * @return void
      */
-    public static function registerAutoloader(AutoloaderInterface $newAutoloader)
+    public static function registerAutoloader(AutoloaderInterface $newAutoloader): void
     {
         self::$autoloader = $newAutoloader;
     }
@@ -31,15 +32,15 @@ public static function registerAutoloader(AutoloaderInterface $newAutoloader)
     /**
      * Returns the registered autoloader
      *
-     * @throws \Exception
+     * @throws InvalidArgumentException
      * @return AutoloaderInterface
      */
-    public static function getAutoloader()
+    public static function getAutoloader(): AutoloaderInterface
     {
-        if (self::$autoloader !== null) {
-            return self::$autoloader;
-        } else {
-            throw new \Exception('Autoloader is not registered, cannot be retrieved.');
+        if (!self::$autoloader instanceof AutoloaderInterface) {
+            throw new InvalidArgumentException('Autoloader is not registered, cannot be retrieved.');
         }
+
+        return self::$autoloader;
     }
 }