diff --git a/src/modules/love/callbacks.lua b/src/modules/love/callbacks.lua
index 94c9eb88f..8d0926a83 100644
--- a/src/modules/love/callbacks.lua
+++ b/src/modules/love/callbacks.lua
@@ -273,12 +273,8 @@ function love.errorhandler(msg)
 	end
 
 	table.insert(err, "\n")
-
-	if trace:sub(-1) ~= "\n" then
-		trace = trace .. "\n"
-	end
 	
-	for l in trace:gmatch("(.-)\n") do
+	for l in trace:gmatch("([^\n]+)") do
 		if not l:match("boot.lua") then
 			l = l:gsub("stack traceback:", "Traceback\n")
 			table.insert(err, l)