diff --git a/src/default.scm b/src/default.scm
index 85b7449..3a10227 100644
--- a/src/default.scm
+++ b/src/default.scm
@@ -7,10 +7,11 @@
 
 ;; FIXME(Krey): Process DOMAIN
 
-;; function to print error if environment variable 'HOSTNAME' is not set or if it's value is empty
+;; function to throw error if environment variable 'HOSTNAME' is not set
+ ; or if it's value is empty
 ;; FIXME-QA(Molese): Needs test
 (define system-hostname-check (lambda ()
-    (if (not (system-hostname-set?))
+    (if (eq nil (getenv "HOSTNAME"))
         (throw 1 "Environment variable 'HOSTNAME' is not set, unable to apply sufficient configuration"))
     (if (eq? (getenv "HOSTNAME") #f)
         (throw 1 "Environment variable 'HOSTNAME' is empty, unable to apply sufficient configuration"))))