Fix for #3985, only load configured master tops
Double check that master top is in config