Don't send null to the server, it doesn't like that