diff --git a/amqp/config/amq_configuration.py b/amqp/config/amq_configuration.py
index f98b4e2..021d6dc 100644
--- a/amqp/config/amq_configuration.py
+++ b/amqp/config/amq_configuration.py
@@ -80,20 +80,18 @@ class Backpressure:
         self.time_window = config.getint('CleverMicro-AMQ', self.PREFIX + 'time-window', fallback=3000)
 
 
-DEFAULT_PROPERTIES_FILE = '/app/amqp/config/application.properties'
-
-
 class AMQConfiguration:
     """
     Top level configuration context holder / object
     """
-    def __init__(self):
+    def __init__(self, config_file_name: str = None):
         config = configparser.ConfigParser()
         # Read the application.properties file
-        if os.path.exists(DEFAULT_PROPERTIES_FILE):
-            config.read(DEFAULT_PROPERTIES_FILE)
+        if os.path.exists(config_file_name):
+            config.read(config_file_name)
         else:
-            config.read('../config/application.properties.local')
+            print(f" [E] Configuration file not found: {config_file_name}")
+            print(" [W] Defaulting to preset values, which will likely be wrong, causing errors.")
 
         # Override values with environment variables
         for section in config.sections():
diff --git a/amqp/service/amq_service.py b/amqp/service/amq_service.py
index aa66690..06c823a 100644
--- a/amqp/service/amq_service.py
+++ b/amqp/service/amq_service.py
@@ -84,8 +84,8 @@ class AMQService:
         self.amq_service_message_handler.outstanding.pop(message_id, None)
 
 
-if __name__ == "__main__":
-    amq_configuration: AMQConfiguration = AMQConfiguration()
+# if __name__ == "__main__":
+    # amq_configuration: AMQConfiguration = AMQConfiguration('../config/application.properties.local')
     # amq_service: AMQService = AMQService(amq_configuration, CleverSwarmAmqpAdapter(amq_configuration))
     # amq_service.rabbit_mq_consumer.channel.start_consuming()
     # amq_service.consumer_thread.cancel()