Merge "Check for null metadata on update" into pi-dev