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