diff --git a/src/remote/server.cpp b/src/remote/server.cpp
index 8ad1bd5057..455d6db586 100644
--- a/src/remote/server.cpp
+++ b/src/remote/server.cpp
@@ -3331,9 +3331,6 @@ static bool process_packet(rem_port* port, PACKET* sendL, PACKET* receive, rem_p
 			port = NULL;
 		}
 
-		if (result)
-			*result = port;
-
 	}	// try
 	catch (const Firebird::status_exception& ex)
 	{
@@ -3362,6 +3359,11 @@ static bool process_packet(rem_port* port, PACKET* sendL, PACKET* receive, rem_p
 		return false;
 	}
 
+	if (result)
+	{
+		*result = port;
+	}
+
 	return true;
 }