diff --git a/src/C++/Driver/src/Sensors.cpp b/src/C++/Driver/src/Sensors/Sensors.ino
similarity index 87%
rename from src/C++/Driver/src/Sensors.cpp
rename to src/C++/Driver/src/Sensors/Sensors.ino
index 6e7fee2..7a7b88c 100644
--- a/src/C++/Driver/src/Sensors.cpp
+++ b/src/C++/Driver/src/Sensors/Sensors.ino
@@ -20,8 +20,8 @@ void loop() {
   int mq5Value = analogRead(MQ5_PIN);
 
   // if sensor isn't connected properly display error message
-  if (isnan(h) || isnan(t)) {
-    Serial.println("Fout bij het lezen van de sensor!");
+  if (isnan(h) || isnan(t) || isnan(mq5Value)) {
+    Serial.println("Fout bij het lezen van de sensors!");
     return;
   }
   // puts sensor values in the serial monitor
diff --git a/src/C++/Driver/src/TestM5.cpp b/src/C++/Driver/src/TestM5.ino
similarity index 95%
rename from src/C++/Driver/src/TestM5.cpp
rename to src/C++/Driver/src/TestM5.ino
index 9568724..f76ece0 100644
--- a/src/C++/Driver/src/TestM5.cpp
+++ b/src/C++/Driver/src/TestM5.ino
@@ -1,31 +1,31 @@
-#include <M5Stack.h>           
-#include <Wire.h>              
-#include "Adafruit_SGP30.h"    
-
-Adafruit_SGP30 sgp;
-
-void setup() {
-    M5.begin();                   
-    Serial.begin(9600);         
-
-    
-    if (!sgp.begin()) {
-        Serial.println("SGP30 sensor niet gevonden :(");
-        while (1);
-    }
-    Serial.println("SGP30 sensor gevonden!");
-}
-
-void loop() {
-    delay(1000);
-
-    if (!sgp.IAQmeasure()) {
-        Serial.println("Error bij meting!");
-        return;
-    }
-    Serial.print("eCO2: ");
-    Serial.print(sgp.eCO2);
-    Serial.print(" ppm\tTVOC: ");
-    Serial.print(sgp.TVOC);
-    Serial.println(" ppb");
+#include <M5Stack.h>           
+#include <Wire.h>              
+#include "Adafruit_SGP30.h"    
+
+Adafruit_SGP30 sgp;
+
+void setup() {
+    M5.begin();                   
+    Serial.begin(9600);         
+
+    
+    if (!sgp.begin()) {
+        Serial.println("SGP30 sensor niet gevonden :(");
+        while (1);
+    }
+    Serial.println("SGP30 sensor gevonden!");
+}
+
+void loop() {
+    delay(1000);
+
+    if (!sgp.IAQmeasure()) {
+        Serial.println("Error bij meting!");
+        return;
+    }
+    Serial.print("eCO2: ");
+    Serial.print(sgp.eCO2);
+    Serial.print(" ppm\tTVOC: ");
+    Serial.print(sgp.TVOC);
+    Serial.println(" ppb");
 }
\ No newline at end of file