diff --git a/lynis b/lynis
index 567d93a2..5932baf2 100755
--- a/lynis
+++ b/lynis
@@ -545,6 +545,11 @@ ${NORMAL}
         fi
     fi
     LogTextBreak
+
+    # Pre-execution tests
+    if [ ${UPLOAD_DATA} -eq 1 -a -z "${LICENSE_KEY}" ]; then DisplayError "${ERROR_NO_LICENSE}" 64; fi
+    if [ ${UPLOAD_DATA} -eq 1 -a -z "${UPLOAD_SERVER}" ]; then DisplayError "${ERROR_NO_UPLOAD_SERVER}" 64; fi
+
 #
 #################################################################################
 #