Added more ObjectReference sanity checks