Update to check for null