Making sure that the server is registered before following files

Making sure that the server is registered before following files