diff --git a/src/SPC/builder/linux/SystemUtil.php b/src/SPC/builder/linux/SystemUtil.php
index 8b115663..e49830d2 100644
--- a/src/SPC/builder/linux/SystemUtil.php
+++ b/src/SPC/builder/linux/SystemUtil.php
@@ -211,7 +211,7 @@ class SystemUtil
             // Match Version * line
             // match ldd version: "Version 1.2.3" match 1.2.3
             $pattern = '/Version\s+(\d+\.\d+\.\d+)/';
-            if (preg_match($pattern, $result[1][1], $matches)) {
+            if (preg_match($pattern, $result[1][1] ?? '', $matches)) {
                 return $matches[1];
             }
         }
diff --git a/src/SPC/store/Downloader.php b/src/SPC/store/Downloader.php
index 984cada8..605cd556 100644
--- a/src/SPC/store/Downloader.php
+++ b/src/SPC/store/Downloader.php
@@ -654,8 +654,8 @@ class Downloader
             }
         }
         // If lock file exists for current arch and glibc target, skip downloading
-        $lock_name = self::getPreBuiltLockName($name);
-        if (!$force && $download_as === SPC_DOWN_PRE_BUILT && isset($lock[$lock_name])) {
+
+        if (!$force && $download_as === SPC_DOWN_PRE_BUILT && isset($lock[$lock_name = self::getPreBuiltLockName($name)])) {
             // lock name with env
             if (
                 $lock[$lock_name]['source_type'] === 'archive' && file_exists(DOWNLOAD_PATH . '/' . $lock[$lock_name]['filename']) ||