diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 3657d693bf..5059e3de92 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -117,6 +117,7 @@
 #include <unistd.h>
 #include <signal.h>
 
+#include "access/parallel.h"
 #include "access/slru.h"
 #include "access/transam.h"
 #include "access/xact.h"
@@ -544,8 +545,8 @@ Async_Notify(const char *channel, const char *payload)
 	Notification *n;
 	MemoryContext oldcontext;
 
-	if (IsInParallelMode())
-		elog(ERROR, "cannot send notifications during a parallel operation");
+	if (IsParallelWorker())
+		elog(ERROR, "cannot send notifications from a parallel worker");
 
 	if (Trace_notify)
 		elog(DEBUG1, "Async_Notify(%s)", channel);
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 5bc1d48942..6f5c5545c9 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -804,10 +804,7 @@ ExecShutdownNode(PlanState *node)
 	switch (nodeTag(node))
 	{
 		case T_GatherState:
-			{
-				ExecShutdownGather((GatherState *) node);
-				return true;
-			}
+			ExecShutdownGather((GatherState *) node);
 			break;
 		default:
 			break;