diff --git a/.idea/misc.xml b/.idea/misc.xml
index 12391f3..afcdc7f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.12 (autopicture-v3)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (autopicture-v3)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/python/src/devices.example.yml b/devices.example.yml
similarity index 100%
rename from python/src/devices.example.yml
rename to devices.example.yml
diff --git a/python/src/log_data.py b/python/src/log_data.py
index 179a296..a198d52 100644
--- a/python/src/log_data.py
+++ b/python/src/log_data.py
@@ -30,8 +30,8 @@ def log_to_json(devices):
       "battery_percent": data_obj.battery_percent,
       "battery_volt": data_obj.battery_volt,
       "rssi": dev.rssi,
-      "name": from_config.name,
-      "room": from_config.room
+      "name": from_config.name if from_config is not None else "Unknown",
+      "room": from_config.room if from_config is not None else "Unknown"
     }
     data.append(measurements)
 
diff --git a/run_gateway.sh b/run_gateway.sh
index 47f71e0..0699743 100644
--- a/run_gateway.sh
+++ b/run_gateway.sh
@@ -35,12 +35,26 @@ if [ "$?" != 0 ]; then
   exit 1
 fi
 
+
+check_for_devices_config() {
+  if [ ! -f devices.yml ]; then
+    touch devices.yml
+    echo 'devices:
+  - mac: A4:C1:38:00:00:00
+    name: "my_room"
+    room: "my_room"' >> devices.yml
+  fi
+}
+
+
 docker_run() {
   sudo killall -9 bluetoothd > /dev/null 2>&1
   echo Killing old container...
   docker stop $CONTAINER_NAME > /dev/null 2>&1
   docker container rm $CONTAINER_NAME > /dev/null 2>&1
 
+  check_for_devices_config
+
   COMMAND="docker run $BACKGROUND"
   COMMAND="$COMMAND --cap-add=SYS_ADMIN"
   COMMAND="$COMMAND --cap-add=NET_ADMIN"
@@ -49,6 +63,7 @@ docker_run() {
   COMMAND="$COMMAND --restart=on-failure"
   COMMAND="$COMMAND --volume=/var/run/dbus/:/var/run/dbus/"
   COMMAND="$COMMAND --volume=$VOLUME:/src/data"
+  COMMAND="$COMMAND --volume=$PWD/devices.yml:/src/devices.yml"
 
   if [ "$INTERACTIVE" = true ]; then
     COMMAND="$COMMAND --interactive"