Slave is not Defined Error

Not sure if this was caused by one of my changes (though I doubt it).