Merge "Check for null metadata on update"