Fix an issue when reconfiguring slaves

Spot instances would cause a NPE. This should be fixed now.