diff --git a/src/config.c b/src/config.c
index 71f8c19..7028e37 100644
--- a/src/config.c
+++ b/src/config.c
@@ -193,7 +193,14 @@ int itss_config(void* facilities_s, char* config_file) {
                 fseek(fp, 0, SEEK_END);
                 uint16_t size = ftell(fp);
                 fseek(fp, 0, SEEK_SET);
-                if (!fread(pz_xml, 1, size, fp)) continue;
+                if (!size) {
+                    fclose(fp);
+                    continue;
+                }
+                if (!fread(pz_xml, 1, size, fp)) {
+                    fclose(fp);
+                    continue;
+                }
                 fclose(fp);
                
                 ProtectedCommunicationZone_t *zone = calloc(1, sizeof(ProtectedCommunicationZone_t));
diff --git a/src/facilities.c b/src/facilities.c
index ab6245d..bd1cf03 100644
--- a/src/facilities.c
+++ b/src/facilities.c
@@ -84,9 +84,7 @@ static int transport_indication(facilities_t *facilities, void* responder, uint8
     switch (bdi->destinationPort) {
         case Port_cam:
 
-            if (facilities->station_type == 15) { // Currently only RSUs need to check CAMs
-                check_cam(facilities, bdi, its_msg);
-            }
+            check_cam(facilities, bdi, its_msg);
 
             break;
         case Port_denm: