Handle behavior with translating null objects back and forth
Fix codegen typo