diff --git a/vpd-manager/editor_impl.cpp b/vpd-manager/editor_impl.cpp
index 6015d7c..898a925 100644
--- a/vpd-manager/editor_impl.cpp
+++ b/vpd-manager/editor_impl.cpp
@@ -601,22 +601,29 @@
         // prevent any data/ECC corruption in case BMC reboots while VPD update.
         enableRebootGuard();
 
-        // TODO: Figure out a better way to get max possible VPD size.
         Binary completeVPDFile;
-        completeVPDFile.resize(65504);
         vpdFileStream.exceptions(std::ifstream::badbit |
                                  std::ifstream::failbit);
         try
         {
             vpdFileStream.open(vpdFilePath,
                                std::ios::in | std::ios::out | std::ios::binary);
+
+            auto vpdFileSize = std::min(std::filesystem::file_size(vpdFilePath),
+                                        MAX_VPD_SIZE);
+            if (vpdFileSize == 0)
+            {
+                std::cerr << "File size is 0 for " << vpdFilePath << std::endl;
+                throw std::runtime_error("File size is 0.");
+            }
+
+            completeVPDFile.resize(vpdFileSize);
             vpdFileStream.seekg(startOffset, std::ios_base::cur);
             vpdFileStream.read(reinterpret_cast<char*>(&completeVPDFile[0]),
-                               65504);
-            completeVPDFile.resize(vpdFileStream.gcount());
+                               vpdFileSize);
             vpdFileStream.clear(std::ios_base::eofbit);
         }
-        catch (const std::ifstream::failure& fail)
+        catch (const std::system_error& fail)
         {
             std::cerr << "Exception in file handling [" << vpdFilePath
                       << "] error : " << fail.what();