Improve tolerance for objects with null context