diff --git a/vpd_tool.cpp b/vpd_tool.cpp
index 2e51372..d53a593 100644
--- a/vpd_tool.cpp
+++ b/vpd_tool.cpp
@@ -107,11 +107,16 @@
 
     try
     {
-        if (objectPath.empty())
+        if (*object && objectPath.empty())
         {
             throw runtime_error("Given path is empty.");
         }
 
+        if (*record && (recordName.size() != 4))
+        {
+            throw runtime_error("Record " + recordName + " not supported.");
+        }
+
         if ((*kw) && (keyword.size() != 2))
         {
             throw runtime_error("Keyword " + keyword + " not supported.");