RED-37511 Made sure that the finder plugin doesnt send nulls to the client