Added additional checking for server registration
Fixed display error and added warning.