diff --git a/Modules/BuildList.lua b/Modules/BuildList.lua
index 8c9f7992..50738dc7 100644
--- a/Modules/BuildList.lua
+++ b/Modules/BuildList.lua
@@ -102,7 +102,7 @@ function listMode:BuildList()
 end
 
 function listMode:SortList()
-	local oldSelFileName = self.sel and self.list[self.sel].fileName
+	local oldSelFileName = self.sel and self.list[self.sel] and self.list[self.sel].fileName
 	table.sort(self.list, function(a, b) return a.fileName:upper() < b.fileName:upper() end)
 	if oldSelFileName then
 		self:SelByFileName(oldSelFileName)
@@ -164,6 +164,7 @@ function listMode:New()
 		end
 		outFile:write('<?xml version="1.0" encoding="UTF-8"?>\n<PathOfBuilding>\n</PathOfBuilding>')
 		outFile:close()
+		self.sel = 1
 		self.list[self.sel].fileName = fileName
 		self.list[self.sel].buildName = buf
 		self:SortList()
@@ -171,10 +172,16 @@ function listMode:New()
 end
 
 function listMode:LoadSel()
+	if not self.sel or not self.list[self.sel] then
+		return
+	end
 	main:SetMode("BUILD", main.buildPath..self.list[self.sel].fileName, self.list[self.sel].buildName)
 end
 
 function listMode:CopySel()
+	if not self.sel or not self.list[self.sel] then
+		return
+	end
 	local srcName = self.list[self.sel].fileName
 	table.insert(self.list, self.sel + 1, copyTable(self.list[self.sel]))
 	self.sel = self.sel + 1
@@ -207,6 +214,9 @@ function listMode:CopySel()
 end
 
 function listMode:RenameSel()
+	if not self.sel or not self.list[self.sel] then
+		return
+	end
 	local oldName = self.list[self.sel].fileName
 	self:EditInit(function(buf)
 		if #buf < 1 then
@@ -234,6 +244,9 @@ function listMode:RenameSel()
 end
 
 function listMode:DeleteSel()
+	if not self.sel or not self.list[self.sel] then
+		return
+	end
 	main:OpenConfirmPopup("Confirm Delete", "Are you sure you want to delete build:\n"..self.list[self.sel].buildName.."\nThis cannot be undone.", "Delete", function()
 		os.remove(main.buildPath..self.list[self.sel].fileName)
 		self:BuildList()
diff --git a/manifest.xml b/manifest.xml
index 62c5f0e9..70fd929f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.0.0"/>
+	<Version number="1.0.1"/>
 	<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
 	<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
 	<File sha1="61015c55ce37b065d24a70cf3f35ed3f66f5cb7b" name="Launch.lua" part="program"/>
@@ -34,7 +34,7 @@
 	<File sha1="5f28e18b2867769b6141109332f263e12c74b2f9" name="Classes/TreeTab.lua" part="program"/>
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="5002676f4d7b6ee38bf7d18feca5798123315af4" name="Modules/Build.lua" part="program"/>
-	<File sha1="6e94bd1923414b7bbd5f02b3206214e997aa4825" name="Modules/BuildList.lua" part="program"/>
+	<File sha1="ccd4efb6233b86e408459cf8cda67a60b2759e8a" name="Modules/BuildList.lua" part="program"/>
 	<File sha1="9c018be9d2558e66107ddadcb3b08ebc36f3f9e9" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="7721650215b51d7c472da2e81389b81c91c6b498" name="Modules/CalcsView.lua" part="program"/>
 	<File sha1="d594ac3a7c8fd823664891db1874b29666bf1915" name="Modules/Common.lua" part="program"/>