Yeah, I didn't think I needed the test (but it's testing the internals of the thing checked as None earlier; so, it's not redundant.) The other place in the file used the less lenient test. I changed this. I think it still needs to check the locator b/c I don't trust all xblock constructors to add it (e.g., when migrating from one modulestore to another)