From f4b34f1d02dcb0d36f992af19cb602dc422b5d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Wed, 12 Oct 2016 10:22:25 +0200
Subject: [PATCH] Error handler: set 'code' and 'description' defaults
 separately.

---
 pillar/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pillar/__init__.py b/pillar/__init__.py
index 30d4b304..8bf3f457 100644
--- a/pillar/__init__.py
+++ b/pillar/__init__.py
@@ -378,6 +378,7 @@ class PillarServer(Eve):
         # handle it as a 500.
         if not hasattr(error_ob, 'code'):
             error_ob.code = 500
+        if not hasattr(error_ob, 'description'):
             error_ob.description = str(error_ob)
 
         if request.full_path.startswith('/%s/' % self.config['URL_PREFIX']):