diff --git a/include/consts b/include/consts
index 343567df..4f8c5246 100644
--- a/include/consts
+++ b/include/consts
@@ -313,6 +313,16 @@ unset LANG
     XARGSBINARY=""
     YUMBINARY=""
     ZYPPERBINARY=""
+
+# == Variables for strict mode ==
+    IFCONFIGBINARY=""
+    LOCATEBINARY=""
+    SEARCH_VERSION=""
+    SHA1SUMBINARY=""
+    SHA256SUMBINARY=""
+    OPENSSLBINARY=""
+    LICENSE_KEY=""
+
 #
 #################################################################################
 #
diff --git a/include/functions b/include/functions
index d8c39740..a48c338d 100644
--- a/include/functions
+++ b/include/functions
@@ -1400,7 +1400,8 @@
         # AIX does not fully support pgrep options, so using ps instead
         if [ -n "${PGREPBINARY}" -a ! "${OS}" = "AIX" ]; then
             # When --user is used, perform a search using the -u option
-            if [ -n "${users}" ]; then
+                            # Initialize users for strict mode
+            if [ -n "${users:-}" ]; then
                 for u in "${users}"; do
                     user_uid=$(getent passwd ${u} 2> /dev/null | ${AWKBINARY} -F: '{print $3}')
                     # Only perform search if user exists and we had no match yet
@@ -2641,8 +2642,9 @@
 
     # Log exceptions
     ReportException() {
-        Report "exception_event[]=$1|$2|"
-        LogText "Exception: test has an exceptional event ($1) with text $2"
+        # Allow this function with only 1 parameter in strict mode with ${2-Text}
+        Report "exception_event[]=$1|${2-NoInfo}|"
+        LogText "Exception: test has an exceptional event ($1) with text ${2-NoText}"
     }