Fixed filename weirdness if client name doesn't exist