diff --git a/fuzz/lzw_fuzzer_seed_corpus/a19f987b885f5a96069f4bc7f12b9e84ceba7dfa b/fuzz/lzw_fuzzer_seed_corpus/a19f987b885f5a96069f4bc7f12b9e84ceba7dfa
new file mode 100644
index 00000000..f96c401f
--- /dev/null
+++ b/fuzz/lzw_fuzzer_seed_corpus/a19f987b885f5a96069f4bc7f12b9e84ceba7dfa
@@ -0,0 +1 @@
+ÿÿ
\ No newline at end of file
diff --git a/fuzz/qtest/fuzz.test b/fuzz/qtest/fuzz.test
index 83756de4..26ae4f10 100644
--- a/fuzz/qtest/fuzz.test
+++ b/fuzz/qtest/fuzz.test
@@ -23,7 +23,7 @@ my @fuzzers = (
     ['dct' => 1],
     ['flate' => 1],
     ['hex' => 1],
-    ['lzw' => 1],
+    ['lzw' => 2],
     ['pngpredictor' => 1],
     ['runlength' => 6],
     ['tiffpredictor' => 1],
diff --git a/libqpdf/Pl_LZWDecoder.cc b/libqpdf/Pl_LZWDecoder.cc
index 6cc87048..81069da6 100644
--- a/libqpdf/Pl_LZWDecoder.cc
+++ b/libqpdf/Pl_LZWDecoder.cc
@@ -107,7 +107,7 @@ Pl_LZWDecoder::getFirstChar(unsigned int code)
 	unsigned int idx = code - 258;
 	if (idx >= table.size())
         {
-            throw std::logic_error(
+            throw std::runtime_error(
                 "Pl_LZWDecoder::getFirstChar: table overflow");
         }
 	Buffer& b = table.at(idx);
@@ -115,7 +115,7 @@ Pl_LZWDecoder::getFirstChar(unsigned int code)
     }
     else
     {
-        throw std::logic_error(
+        throw std::runtime_error(
             "Pl_LZWDecoder::getFirstChar called with invalid code (" +
             QUtil::int_to_string(code) + ")");
     }
@@ -140,7 +140,7 @@ Pl_LZWDecoder::addToTable(unsigned char next)
 	unsigned int idx = this->last_code - 258;
 	if (idx >= table.size())
         {
-            throw std::logic_error(
+            throw std::runtime_error(
                 "Pl_LZWDecoder::addToTable: table overflow");
         }
 	Buffer& b = table.at(idx);
@@ -149,7 +149,7 @@ Pl_LZWDecoder::addToTable(unsigned char next)
     }
     else
     {
-        throw std::logic_error(
+        throw std::runtime_error(
             "Pl_LZWDecoder::addToTable called with invalid code (" +
             QUtil::int_to_string(this->last_code) + ")");
     }
@@ -239,7 +239,13 @@ Pl_LZWDecoder::handleCode(unsigned int code)
 	}
 	else
 	{
-	    Buffer& b = table.at(code - 258);
+            unsigned int idx = code - 258;
+            if (idx >= table.size())
+            {
+                throw std::runtime_error(
+                    "Pl_LZWDecoder::handleCode: table overflow");
+            }
+	    Buffer& b = table.at(idx);
 	    getNext()->write(b.getBuffer(), b.getSize());
 	}
     }