From 7f9e80db104cf260ed7bb8210bff900f6d7c1927 Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Fri, 21 Apr 2017 17:01:01 +0200
Subject: [PATCH] Only process error if not NULL in StoreErrorMessage

---
 .../distributed/master/master_citus_tools.c    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/backend/distributed/master/master_citus_tools.c b/src/backend/distributed/master/master_citus_tools.c
index 3ccc56aa1..b46b60739 100644
--- a/src/backend/distributed/master/master_citus_tools.c
+++ b/src/backend/distributed/master/master_citus_tools.c
@@ -435,17 +435,19 @@ static void
 StoreErrorMessage(PGconn *connection, StringInfo queryResultString)
 {
 	char *errorMessage = PQerrorMessage(connection);
-	char *firstNewlineIndex = strchr(errorMessage, '\n');
-
-	/* trim the error message at the line break */
-	if (firstNewlineIndex != NULL)
+	if (errorMessage != NULL)
 	{
-		*firstNewlineIndex = '\0';
+		char *firstNewlineIndex = strchr(errorMessage, '\n');
+
+		/* trim the error message at the line break */
+		if (firstNewlineIndex != NULL)
+		{
+			*firstNewlineIndex = '\0';
+		}
 	}
-
-	/* put a default error message if no error message is reported */
-	if (errorMessage == NULL)
+	else
 	{
+		/* put a default error message if no error message is reported */
 		errorMessage = "An error occurred while running the query";
 	}