Make detection work with None values #1