From 515197a903a99e204e45ab812e35895f0f94eaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Sat, 4 Jun 2016 14:52:53 -0700 Subject: [PATCH] Don't try and decode an empty body --- elasticsearch/connection/base.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/elasticsearch/connection/base.py b/elasticsearch/connection/base.py index cf4fd67f..9cad0ff4 100644 --- a/elasticsearch/connection/base.py +++ b/elasticsearch/connection/base.py @@ -103,10 +103,11 @@ class Connection(object): error_message = raw_data additional_info = None try: - additional_info = json.loads(raw_data) - error_message = additional_info.get('error', error_message) - if isinstance(error_message, dict) and 'type' in error_message: - error_message = error_message['type'] + if raw_data: + additional_info = json.loads(raw_data) + error_message = additional_info.get('error', error_message) + if isinstance(error_message, dict) and 'type' in error_message: + error_message = error_message['type'] except (ValueError, TypeError) as err: logger.warning('Undecodable raw error response from server: %s', err)