diff --git a/src/com/sap/piper/ConfigurationHelper.groovy b/src/com/sap/piper/ConfigurationHelper.groovy
index 4e6bb6627..ee78dc459 100644
--- a/src/com/sap/piper/ConfigurationHelper.groovy
+++ b/src/com/sap/piper/ConfigurationHelper.groovy
@@ -109,10 +109,7 @@ class ConfigurationHelper implements Serializable {
 
     def getMandatoryProperty(key, defaultValue = null, errorMessage = null) {
 
-        def paramValue = config[key]
-
-        if (paramValue == null)
-            paramValue = defaultValue
+        def paramValue = getConfigProperty(key, defaultValue)
 
         if (paramValue == null) {
             if(! errorMessage) errorMessage = "ERROR - NO VALUE AVAILABLE FOR ${key}"