Breaking Change: Properly handle nil objects