Fix NPE in slave registration