diff --git a/rpi/main.py b/rpi/main.py
index 3dd3d096..85d3c55c 100644
--- a/rpi/main.py
+++ b/rpi/main.py
@@ -21,22 +21,45 @@ def start_party():
     print("Party started!")
     pass
 
+def exit_app():
+    rfid_reader.stop()
+    light_sensor_reader.stop()
+    exit()
+
 if __name__ == "__main__":
 
-    screen.enableBackground()
-    screen.displayMessage("Waiting for scan...")
+    try :
+        print("Starting app...")
 
-    rfid_reader.subscribe(lambda uid: mqtt_service.publish(
-        "rpi", "/board-mate/rfid/scan", str(uid), 0
-    ))
-    rfid_reader.start()
+        screen.enableBackground()
+        screen.displayMessage("Waiting for scan...")
 
-    rfid_reader.subscribe(lambda light_value: mqtt_service.publish(
-        "rpi", "/board-mate/light/notify", str(light_value), 0
-    ))
-    light_sensor_reader.start()
+        print("Screen enabled.")
+
+        rfid_reader.subscribe(lambda uid: mqtt_service.publish(
+            "rpi", "/board-mate/rfid/scan", str(uid), 0
+        ))
+        rfid_reader.start()
+
+        print("RFID reader started.")
+
+        light_sensor_reader.subscribe(lambda light_value: mqtt_service.publish(
+            "rpi", "/board-mate/light/notify", str(light_value), 0
+        ))
+        light_sensor_reader.start()
+        print("Light sensor reader started.")
+
+        app.run(host="0.0.0.0", port=5000, debug=False)
+        print("Server started.")
+
+    except KeyboardInterrupt:
+        print("Keyboard interrupt. Stopping app...")
+        exit_app()
+
+    except Exception as e:
+        print(e)
+        exit_app()
 
-    app.run(host="0.0.0.0", port=5000, debug=False)
 
 
 """