Merge "Clean up NULL object handling."