From 0ce3015cf0884ec4e6b1f33b71b50f2bbfdc6601 Mon Sep 17 00:00:00 2001
From: Manu Evans <mevans@euclideon.com>
Date: Mon, 11 Jul 2016 17:13:06 +1000
Subject: [PATCH] Fix regression in expandtoken

---
 src/base/detoken.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/base/detoken.lua b/src/base/detoken.lua
index 5d53695a..b539d49d 100644
--- a/src/base/detoken.lua
+++ b/src/base/detoken.lua
@@ -62,6 +62,7 @@
 				result = nil
 			else
 				err    = nil
+				result = result or ""
 			end
 
 			-- If the result is an absolute path, and it is being inserted into
@@ -90,7 +91,7 @@
 					success, result = pcall(result, e)
 					if not success then
 						return nil, result
-					end					
+					end
 				end
 
 				if (type(result) == "table") then