Added code for preventing serialization errors.