(not mergeable) runtime error if layout not found

This breaks one of the existing tests in a way that I don't understand. I think part of the problem is that layout=None has two meanings ("Neuromag of any kind" and "unknown layout"), but I'm a little out of my depth here. Perhaps whoever wrote this code could pitch in?