Updated client and server handling of null/"None"