CGIV-4304: Fix to ensure that if the server is not set we don't try to run it