Merge "Fix KeyError exc in volumes_client"