Better handling for undefined @client