Same again, add null checks for all mandatory properties.