diff --git a/BurnOutSharp/External/libmsi/Internal/LibmsiTable.cs b/BurnOutSharp/External/libmsi/Internal/LibmsiTable.cs
index 637d0aeb..2b3212af 100644
--- a/BurnOutSharp/External/libmsi/Internal/LibmsiTable.cs
+++ b/BurnOutSharp/External/libmsi/Internal/LibmsiTable.cs
@@ -199,7 +199,7 @@ namespace LibMSI.Internal
             int inputPtr = 0; // input[0]
             while (count-- != 0)
             {
-                int ch = input[inputPtr++];
+                int ch = inputPtr < input.Length ? input[inputPtr++] : 0;
                 if (ch == 0)
                 {
                     output[p] = (byte)ch;
@@ -209,11 +209,19 @@ namespace LibMSI.Internal
                 if ((ch < 0x80) && (Utf2Mime(ch) >= 0))
                 {
                     ch = Utf2Mime(ch);
-                    next = input[inputPtr];
-                    if (next != 0 && (next < 0x80))
-                        next = Utf2Mime(next);
+
+                    if (inputPtr < input.Length)
+                    {
+                        next = input[inputPtr];
+                        if (next != 0 && (next < 0x80))
+                            next = Utf2Mime(next);
+                        else
+                            next = -1;
+                    }
                     else
+                    {
                         next = -1;
+                    }
 
                     if (next == -1)
                     {
@@ -309,7 +317,7 @@ namespace LibMSI.Internal
             if (stg == null)
                 return LibmsiResult.LIBMSI_RESULT_FUNCTION_FAILED;
 
-            string encname = EncodeStreamName(true, stname);
+            string encname = EncodeStreamName(true, stname).TrimEnd('\0');
 
             Exception err = null;
             GsfInput stm = stg.ChildByName(encname, ref err);
@@ -349,7 +357,7 @@ namespace LibMSI.Internal
             if (db.Outfile == null)
                 return LibmsiResult.LIBMSI_RESULT_FUNCTION_FAILED;
 
-            string encname = EncodeStreamName(true, stname);
+            string encname = EncodeStreamName(true, stname).TrimEnd('\0');
             GsfOutput stm = db.Outfile.NewChild(encname, false);
 
             if (stm == null)
@@ -1212,7 +1220,7 @@ namespace LibMSI.Internal
                 }
             }
 
-            pstname = EncodeStreamName(false, stname);
+            pstname = EncodeStreamName(false, stname).TrimEnd('\0');
             return LibmsiResult.LIBMSI_RESULT_SUCCESS;
 
         err:
diff --git a/BurnOutSharp/External/libmsi/LibmsiDatabase.cs b/BurnOutSharp/External/libmsi/LibmsiDatabase.cs
index 36e00d47..b3757390 100644
--- a/BurnOutSharp/External/libmsi/LibmsiDatabase.cs
+++ b/BurnOutSharp/External/libmsi/LibmsiDatabase.cs
@@ -622,7 +622,7 @@ namespace LibMSI
             if (Flags.HasFlag(LibmsiDbFlags.LIBMSI_DB_FLAGS_READONLY))
                 return LibmsiResult.LIBMSI_RESULT_ACCESS_DENIED;
 
-            string encname = EncodeStreamName(false, stname);
+            string encname = EncodeStreamName(false, stname).TrimEnd('\0');
             foreach (LibmsiStream stream in Streams)
             {
                 if (encname == stream.Name)
diff --git a/BurnOutSharp/External/libmsi/Views/LibmsiStreamsView.cs b/BurnOutSharp/External/libmsi/Views/LibmsiStreamsView.cs
index 3e977f4d..900b1aac 100644
--- a/BurnOutSharp/External/libmsi/Views/LibmsiStreamsView.cs
+++ b/BurnOutSharp/External/libmsi/Views/LibmsiStreamsView.cs
@@ -195,7 +195,7 @@ namespace LibMSI.Views
                 return LibmsiResult.LIBMSI_RESULT_FUNCTION_FAILED;
             }
 
-            encname = EncodeStreamName(false, name);
+            encname = EncodeStreamName(false, name).TrimEnd('\0');
             Database.DestroyStream(encname);
 
             // Shift the remaining rows
diff --git a/BurnOutSharp/External/libmsi/Views/LibmsiTableView.cs b/BurnOutSharp/External/libmsi/Views/LibmsiTableView.cs
index 3552a6b5..b1883d2a 100644
--- a/BurnOutSharp/External/libmsi/Views/LibmsiTableView.cs
+++ b/BurnOutSharp/External/libmsi/Views/LibmsiTableView.cs
@@ -140,7 +140,7 @@ namespace LibMSI.Views
                 return r;
             }
 
-            string encname = EncodeStreamName(false, full_name);
+            string encname = EncodeStreamName(false, full_name).TrimEnd('\0');
             r = Database.GetRawStream(encname, out stm);
             if (r != LibmsiResult.LIBMSI_RESULT_SUCCESS)
                 Console.Error.WriteLine($"Fetching stream {full_name}, error = {r}");