diff --git a/build-emacs-for-macos b/build-emacs-for-macos
index c504ab4..518ace0 100755
--- a/build-emacs-for-macos
+++ b/build-emacs-for-macos
@@ -150,9 +150,11 @@ class AbstractVersion
   attr_reader :version
 
   def initialize
-    @version = load_version.match(
+    str = load_version.strip
+    @version = str.match(
       /(?<major>\d+)(?:\.(?<minor>\d+)(?:\.(?<patch>\d+))?)?/
     )
+    warn "Parsed OS version string: '#{str}' => #{@version ? @version[0] : 'NIL'}"
   end
 
   def load_version
@@ -164,15 +166,15 @@ class AbstractVersion
   end
 
   def major
-    @major ||= @version[:major]&.to_i
+    @major ||= (@version && @version[:major]) ? @version[:major].to_i : 0
   end
 
   def minor
-    @minor ||= @version[:minor]&.to_i
+    @minor ||= (@version && @version[:minor]) ? @version[:minor].to_i : 0
   end
 
   def patch
-    @patch ||= @version[:patch]&.to_i
+    @patch ||= (@version && @version[:patch]) ? @version[:patch].to_i : 0
   end
 end