diff --git a/src/main/scala/com/metabolic/data/core/services/catalogue/AtlanCatalogueAction.scala b/src/main/scala/com/metabolic/data/core/services/catalogue/AtlanCatalogueAction.scala
index 02ddc47..af0e97f 100644
--- a/src/main/scala/com/metabolic/data/core/services/catalogue/AtlanCatalogueAction.scala
+++ b/src/main/scala/com/metabolic/data/core/services/catalogue/AtlanCatalogueAction.scala
@@ -13,14 +13,15 @@ class AtlanCatalogueAction extends AfterAction with Logging {
 
     config.environment.atlanToken match {
       case Some(token) =>
-        if (config.environment.atlanBaseUrlDataLake.isDefined && config.environment.atlanBaseUrlConfluent.isDefined) {
-          val atlan = new AtlanService(token, config.environment.atlanBaseUrlDataLake.get, config.environment.atlanBaseUrlConfluent.get)
-          atlan.setLineage(config)
-          atlan.setMetadata(config)
-          logger.info(s"After Action $name: Pushed lineage generated in ${config.name} to Atlan")
+        (config.environment.atlanBaseUrlDataLake, config.environment.atlanBaseUrlConfluent) match {
+          case (Some(_), Some(_)) =>
+            val atlan = new AtlanService(token, config.environment.atlanBaseUrlDataLake.get, config.environment.atlanBaseUrlConfluent.get)
+            atlan.setLineage(config)
+            atlan.setMetadata(config)
+            logger.info(s"After Action $name: Pushed lineage generated in ${config.name} to Atlan")
+          case _ =>
+            logger.warn(s"After Action: Skipping $name for ${config.name} as Atlan Url is not provided")
         }
-        else
-          logger.warn(s"After Action: Skipping $name for ${config.name} as Atlan Url is not provided")
       case None =>
         logger.warn(s"After Action: Skipping $name for ${config.name} as Atlan Token is not provided")
     }
diff --git a/src/main/scala/com/metabolic/data/mapper/services/ConfigParserService.scala b/src/main/scala/com/metabolic/data/mapper/services/ConfigParserService.scala
index 0dbbbb1..3224681 100644
--- a/src/main/scala/com/metabolic/data/mapper/services/ConfigParserService.scala
+++ b/src/main/scala/com/metabolic/data/mapper/services/ConfigParserService.scala
@@ -95,9 +95,9 @@ class ConfigParserService(implicit region: Regions) extends Logging {
       Regions.fromName("eu-central-1")
     }
 
-    var atlanToken: Option[String] = Option.empty
-    var atlanBaseUrlDataLake: Option[String] = Option.empty
-    var atlanBaseUrlConfluent: Option[String] = Option.empty
+    var atlanToken: Option[String] = None
+    var atlanBaseUrlDataLake: Option[String] = None
+    var atlanBaseUrlConfluent: Option[String] = None
 
     val atlan = if (config.hasPathOrNull("atlan")){
       Option.apply(config.getString("atlan"))