Fix NPE if slaves are not reconfigured after upgrade to 1.7