Fixed handling of NULL scores