Make master client errors a bit more descriptive