diff --git a/include/functions b/include/functions
index ae60db98..4699940d 100644
--- a/include/functions
+++ b/include/functions
@@ -754,35 +754,35 @@
         LogText "Test: check if we can access ${sFILE} (escaped: ${escaped_file})"
 
         # Check for symlink
-        if [ -L ${escaped_file} ]; then
+        if [ -L "${escaped_file}" ]; then
             ShowSymlinkPath ${escaped_file}
             if [ ! -z "${SYMLINK}" ]; then escaped_file="${SYMLINK}"; fi
         fi
 
         # Only check the file if it isn't a symlink (after previous check)
-        if [ -L ${escaped_file} ]; then
+        if [ -L "${escaped_file}" ]; then
             OTHERPERMS="-"
             LogText "Result: unclear if we can read this file, as this is a symlink"
             ReportException "FileIsReadable" "Can not determine symlink ${sFILE}"
-        elif [ -d ${escaped_file} ]; then
-            OTHERPERMS=$(${LSBINARY} -d -l ${escaped_file} 2> /dev/null | ${CUTBINARY} -c 8)
-        elif [ -f ${escaped_file} ]; then
-            OTHERPERMS=$(${LSBINARY} -d -l ${escaped_file} 2> /dev/null | ${CUTBINARY} -c 8)
+        elif [ -d "${escaped_file}" ]; then
+            OTHERPERMS=$(${LSBINARY} -d -l "${escaped_file}" 2> /dev/null | ${CUTBINARY} -c 8)
+        elif [ -f "${escaped_file}" ]; then
+            OTHERPERMS=$(${LSBINARY} -d -l "${escaped_file}" 2> /dev/null | ${CUTBINARY} -c 8)
         else
             OTHERPERMS="-"
         fi
 
         # Also check if we are the actual owner of the file (use -d to get directory itself, if its a directory)
-        FILEOWNER=$(ls -dln ${escaped_file} 2> /dev/null | ${AWKBINARY} -F" " '{ print $3 }')
+        FILEOWNER=$(ls -dln "${escaped_file}" 2> /dev/null | ${AWKBINARY} -F" " '{ print $3 }')
         if [ "${FILEOWNER}" = "${MYID}" ]; then
             LogText "Result: file is owned by our current user ID (${MYID}), checking if it is readable"
-            if [ -L ${sFILE} ]; then
+            if [ -L "${sFILE}" ]; then
                 LogText "Result: unclear if we can read this file, as this is a symlink"
                 ReportException "FileIsReadable" "Can not determine symlink ${escaped_file}"
-            elif [ -d ${escaped_file} ]; then
-                OTHERPERMS=$(${LSBINARY} -d -l ${escaped_file} 2> /dev/null | ${CUTBINARY} -c 2)
-            elif [ -f ${escaped_file} ]; then
-                OTHERPERMS=$(${LSBINARY} -l ${escaped_file} 2> /dev/null | ${CUTBINARY} -c 2)
+            elif [ -d "${escaped_file}" ]; then
+                OTHERPERMS=$(${LSBINARY} -d -l "${escaped_file}" 2> /dev/null | ${CUTBINARY} -c 2)
+            elif [ -f "${escaped_file}" ]; then
+                OTHERPERMS=$(${LSBINARY} -l "${escaped_file}" 2> /dev/null | ${CUTBINARY} -c 2)
             fi
         else
             LogText "Result: file is not owned by current user ID (${MYID}), but UID ${FILEOWNER}"