diff --git a/debian/changelog b/debian/changelog
index 92b6bc6..c055ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+reclass (1.4.1-1tcp3) trusty; urgency=medium
+
+  * backport UndefinedVariableError fix from master
+
+ -- Filip Pytloun <filip@pytloun.cz>  Fri, 16 Oct 2015 21:01:14 +0200
+
 reclass (1.4.1-1tcp2) trusty; urgency=medium
 
   * make symlink to reclass-salt and reclass-ansible
diff --git a/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch b/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
new file mode 100644
index 0000000..5928029
--- /dev/null
+++ b/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
@@ -0,0 +1,31 @@
+From fbd22d42a20a0fdd53bc42fd27ad9f3d6af70f80 Mon Sep 17 00:00:00 2001
+From: Michael Kuty <6du1ro.n@gmail.com>
+Date: Fri, 16 Oct 2015 18:10:18 +0200
+Subject: [PATCH 1/2] Fix UndefinedVariableError, which had, uh, undefined
+ variables
+
+Signed-off-by: martin f. krafft <madduck@madduck.net>
+---
+ reclass/errors.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/reclass/errors.py b/reclass/errors.py
+index 4da2bc3..ddb95fd 100644
+--- a/reclass/errors.py
++++ b/reclass/errors.py
+@@ -131,9 +131,11 @@ class UndefinedVariableError(InterpolationError):
+         super(UndefinedVariableError, self).__init__(msg=None)
+         self._var = var
+         self._context = context
++    var = property(lambda self: self._var)
++    context = property(lambda self: self._context)
+ 
+     def _get_message(self):
+-        msg = "Cannot resolve " + var.join(PARAMETER_INTERPOLATION_SENTINELS)
++        msg = "Cannot resolve " + self._var.join(PARAMETER_INTERPOLATION_SENTINELS)
+         if self._context:
+             msg += ' in the context of %s' % self._context
+         return msg
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a932daa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch