Fix treatment of None in analytics