Adding first rev, second rev needs better handling of null/undefined values