diff --git a/lua/autorun/trackassembly_init.lua b/lua/autorun/trackassembly_init.lua
index 0bd1fde..f9efe1b 100644
--- a/lua/autorun/trackassembly_init.lua
+++ b/lua/autorun/trackassembly_init.lua
@@ -93,7 +93,7 @@ local asmlib = trackasmlib; if(not asmlib) then -- Module present
 ------------ CONFIGURE ASMLIB ------------
 
 asmlib.InitBase("track","assembly")
-asmlib.SetOpVar("TOOL_VERSION","8.699")
+asmlib.SetOpVar("TOOL_VERSION","8.700")
 asmlib.SetIndexes("V" ,1,2,3)
 asmlib.SetIndexes("A" ,1,2,3)
 asmlib.SetIndexes("WV",1,2,3)
diff --git a/lua/trackassembly/trackasmlib.lua b/lua/trackassembly/trackasmlib.lua
index 38a731a..baf3230 100644
--- a/lua/trackassembly/trackasmlib.lua
+++ b/lua/trackassembly/trackasmlib.lua
@@ -292,7 +292,7 @@ function GetOwner(oEnt)
     if(IsPlayer(ows)) then return ows else ows = nil end
     set = set.undo1; ows = (set.Args and set.Args[1] or nil)
     if(IsPlayer(ows)) then return ows else ows = nil end
-  end; return nil -- No owner is found. Nothing is returned
+  end; return ows -- No owner is found. Nothing is returned
 end
 
 function IsOther(oEnt)