Fix case where master isn't found