Detect undefined auto.master, take 2