diff --git a/addons/libs/extdata.lua b/addons/libs/extdata.lua
index c92e7bdcf..61f73a2d9 100644
--- a/addons/libs/extdata.lua
+++ b/addons/libs/extdata.lua
@@ -1481,7 +1481,7 @@ function tools.bit.l_to_r_bit_packed(dat_string,start,stop)
     local c_count = math.ceil(stop/8)
     while c_count >= math.ceil((start+1)/8) do
         -- Grabs the most significant byte first and works down towards the least significant.
-        local cur_val = dat_string:byte(c_count)
+        local cur_val = dat_string:byte(c_count) or 0
         local scal = 1
         
         if c_count == math.ceil(stop/8) then -- Take the least significant bits of the most significant byte
@@ -1683,7 +1683,10 @@ end
 
 function decode.Linkshell(str)
     local status_map = {[0]='Unopened',[1]='Linkshell',[2]='Pearlsack',[3]='Linkpearl',[4]='Broken'}
-    local name_end = string.find(str,string.char(0),10)
+    local name_end = #str
+    while str:byte(name_end) == 0 and name_end > 10 do
+        name_end = name_end - 1
+    end
     local name_map = {[0]="'",[1]="a",[2]='b',[3]='c',[4]='d',[5]='e',[6]='f',[7]='g',[8]='h',[9]='i',[10]='j',
         [11]='k',[12]='l',[13]='m',[14]='n',[15]='o',[16]='p',[17]='q',[18]='r',[19]='s',[20]='t',[21]='u',[22]='v',[23]='w',
         [24]='x',[25]='yx',[26]='z',[27]='A',[28]='B',[29]='C',[30]='D',[31]='E',[32]='F',[33]='G',[34]='H',[35]='I',[36]='J',