Update to handle null values on personal data