diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 9ccc07cc3..755c1e748 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1088,7 +1088,7 @@ static int gdb_get_register_packet(struct connection *connection,
 
 	if (reg_list_size <= reg_num) {
 		LOG_ERROR("gdb requested a non-existing register");
-		exit(-1);
+		return ERROR_SERVER_REMOTE_CLOSED;
 	}
 
 	if (!reg_list[reg_num]->valid)