diff --git a/LibSession-Util b/LibSession-Util
index 610965b41..60b3021d8 160000
--- a/LibSession-Util
+++ b/LibSession-Util
@@ -1 +1 @@
-Subproject commit 610965b417709e77c7f3b832dae6fce75088c198
+Subproject commit 60b3021d816d8cc45d770d32d98076808e252c57
diff --git a/Scripts/build_libSession_util.sh b/Scripts/build_libSession_util.sh
index 2f6e9c64b..b7371d3cb 100755
--- a/Scripts/build_libSession_util.sh
+++ b/Scripts/build_libSession_util.sh
@@ -210,16 +210,26 @@ for i in "${!TARGET_ARCHS[@]}"; do
     echo ""
     exec 1>&3
 
+    # Retrieve and log any submodule errors/warnings
+    ALL_CMAKE_ERROR_LINES=($(grep -nE "CMake Error" "$log_file" | cut -d ":" -f 1))
+    ALL_SUBMODULE_ISSUE_LINES=($(grep -nE "\s*Submodule '([^']+)' is not up-to-date" "$log_file" | cut -d ":" -f 1))
+    ALL_CMAKE_ERROR_LINES_STR=" ${ALL_CMAKE_ERROR_LINES[*]} "
+    ALL_SUBMODULE_ISSUE_LINES_STR=" ${ALL_SUBMODULE_ISSUE_LINES[*]} "
+
+    for i in "${!ALL_SUBMODULE_ISSUE_LINES[@]}"; do
+      line="${ALL_SUBMODULE_ISSUE_LINES[$i]}"
+      prev_line=$((line - 1))
+      value=$(sed "${line}q;d" "$log_file" | sed -E "s/.*Submodule '([^']+)'.*/Submodule '\1' is not up-to-date./")
+      
+      if [[ "$ALL_CMAKE_ERROR_LINES_STR" == *" $prev_line "* ]]; then
+        echo "error: $value"
+      else
+        echo "warning: $value"
+      fi
+    done
+
     if [ $EXIT_STATUS -ne 0 ]; then
-      ALL_SUBMODULE_ERROR_LINES=($(grep -nE "\s*Submodule '([^']+)' is not up-to-date" "$log_file" | cut -d ":" -f 1))
       ALL_ERROR_LINES=($(grep -n "error:" "$log_file" | cut -d ":" -f 1))
-      
-      # Log any submodule errors
-      for e in "${!ALL_SUBMODULE_ERROR_LINES[@]}"; do
-        error_line="${ALL_SUBMODULE_ERROR_LINES[$e]}"
-        error=$(sed "${error_line}q;d" "$log_file" | sed -E "s/.*Submodule '([^']+)'.*/Submodule '\1' is not up-to-date./")
-        echo "error: $error"
-      done
 
       # Log any other errors
       for e in "${!ALL_ERROR_LINES[@]}"; do
@@ -238,15 +248,6 @@ for i in "${!TARGET_ARCHS[@]}"; do
         fi
       done
       exit 1
-    else
-      ALL_SUBMODULE_WARNING_LINES=($(grep -nE "\s*Submodule '([^']+)' is not up-to-date" "$log_file" | cut -d ":" -f 1))
-      
-      # Log any submodule warnings
-      for e in "${!ALL_SUBMODULE_WARNING_LINES[@]}"; do
-        warning_line="${ALL_SUBMODULE_WARNING_LINES[$w]}"
-        warning=$(sed "${warning_line}q;d" "$log_file" | sed -E "s/.*Submodule '([^']+)'.*/Submodule '\1' is not up-to-date./")
-        echo "warning: $warning"
-      done
     fi
 done