Fix NPE when locations are not existent

+ rename initial node to master node (not the one bootstrapping, but the
one processing the UP queue)

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>