diff --git a/WHENCE b/WHENCE
index a8003643..3897121a 100644
--- a/WHENCE
+++ b/WHENCE
@@ -6127,7 +6127,7 @@ Version: ADSP.HT.5.5.c8-00149-KODIAK-1
 RawFile: qcom/qcm6490/adspr.jsn
 RawFile: qcom/qcm6490/adsps.jsn
 RawFile: qcom/qcm6490/adspua.jsn
-File: qcom/qcm6490/battmgr.jsn
+RawFile: qcom/qcm6490/battmgr.jsn
 File: qcom/qcm6490/cdsp.mbn
 Version: CDSP.HT.2.5.c3-00077-KODIAK-1
 RawFile: qcom/qcm6490/cdspr.jsn
diff --git a/copy-firmware.sh b/copy-firmware.sh
index 6757c6ce..6c557f23 100755
--- a/copy-firmware.sh
+++ b/copy-firmware.sh
@@ -133,7 +133,7 @@ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
         directory="$destdir/$(dirname "$f")"
         install -d "$directory"
         target="$(cd "$directory" && realpath -m -s "$d")"
-        if test -d "$target"; then
+        if test -e "$target"; then
             $verbose "creating link $f -> $d"
             ln -s "$d" "$destdir/$f"
         else
@@ -143,6 +143,13 @@ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
     fi
 done
 
+# Verify no broken symlinks
+if test "$(find "$destdir" -xtype l | wc -l)" -ne 0 ; then
+        echo "ERROR: Broken symlinks found:"
+        find "$destdir" -xtype l
+        exit 1
+fi
+
 exit 0
 
 # vim: et sw=4 sts=4 ts=4