Fix treatment of metadata that isn't always present