Make sure not to create 'None' values in metadata in case they are not defined