Merge "Fixed yet another missing check for null anchor..."