Added safety checks on ObjectProperty resolution