Add check to make sure metadata exists