diff --git a/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh b/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh
index 8bfd83e..c3d96e5 100644
--- a/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh
+++ b/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh
@@ -807,6 +807,7 @@ makeAllSwapSystems() {
     [[ -z $imgPartitionType ]] && handleError "No image partition type passed (${FUNCNAME[0]})\n   Args Passed: $*"
     local swapuuidfilename=""
     swapUUIDFileName "$imagePath" "$disk_number"
+    [[ -r "$swapuuidfilename" ]] || return
     local parts=""
     local part=""
     local part_number=0
diff --git a/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/partition-funcs.sh b/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/partition-funcs.sh
index 647a9a7..13301e3 100644
--- a/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/partition-funcs.sh
+++ b/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/partition-funcs.sh
@@ -85,10 +85,10 @@ restoreUUIDInformation() {
     for part in $parts; do
         partitionIsSwap "$part"
         getPartitionNumber "$part"
+        local escape_part=$(escapeItem $part)
         [[ $is_swap -gt 0 ]] && continue
-        pat="/^.*\/dev\/[A-Za-z0-9]+([Pp]|)[$part_number].*"
-        partuuid=$(awk -F[,\ ] "match(\$0, ${pat}uuid=([A-Za-z0-9-]+)[,]?.*$/, type){printf(\"%s:%s\", $part_number, tolower(type[2]))}" $sfdiskoriginalpartitionfilename)
-        parttype=$(awk -F[,\ ] "match(\$0, ${pat}type=([A-Za-z0-9-]+)[,]?.*$/, type){printf(\"%s:%s\", $part_number, tolower(type[2]))}" $sfdiskoriginalpartitionfilename)
+        partuuid=$(awk -F[,\ ] "match(\$0, /^${escape_part} : .*uuid=([A-Za-z0-9-]+)[,]?.*$/, type){printf(\"%s:%s\", $part_number, tolower(type[1]))}" $sfdiskoriginalpartitionfilename)
+        parttype=$(awk -F[,\ ] "match(\$0, /^${escape_part} : .*type=([A-Za-z0-9-]+)[,]?.*$/, type){printf(\"%s:%s\", $part_number, tolower(type[1]))}" $sfdiskoriginalpartitionfilename)
         dots "Partition type being set to"
         echo $parttype
         debugPause
@@ -354,8 +354,7 @@ makeSwapSystem() {
     local part_number=""
     local escape_part=$(escapeItem $part)
     getPartitionNumber "$part"
-    local pat="/^\/dev\/[A-Za-z0-9]+([Pp]|)[$part_number]\ /"
-    local uuid=$(awk "$pat{print \$2}" $file)
+    local uuid=$(awk "/^${escape_part} /{print \$2}" $file)
     local hasgpt=0
     hasGPT "$disk"
     case $hasgpt in