diff --git a/SPDAccessor/EE1004Accessor_Linux.cpp b/SPDAccessor/EE1004Accessor_Linux.cpp
index 12386b04..9b48d36f 100644
--- a/SPDAccessor/EE1004Accessor_Linux.cpp
+++ b/SPDAccessor/EE1004Accessor_Linux.cpp
@@ -47,6 +47,12 @@ uint8_t EE1004Accessor::at(uint16_t addr)
     {
         readEEPROM();
     }
+    // Prevent indexing out of bounds
+    if(addr >= sizeof(dump))
+    {
+        return 0xFF;
+    }
+
     return dump[addr];
 }
 
diff --git a/SPDAccessor/SPD5118Accessor_Linux.cpp b/SPDAccessor/SPD5118Accessor_Linux.cpp
index 3fe2e060..4ed392fb 100644
--- a/SPDAccessor/SPD5118Accessor_Linux.cpp
+++ b/SPDAccessor/SPD5118Accessor_Linux.cpp
@@ -48,6 +48,12 @@ uint8_t SPD5118Accessor::at(uint16_t addr)
     {
         readEEPROM();
     }
+    // Prevent indexing out of bounds
+    if(addr >= sizeof(dump))
+    {
+        return 0xFF;
+    }
+
     return dump[addr];
 }