Adding null/empty checks for metadata save
-- Azure requires metadata have a value