Fix deserialization problems
Mod null checking