Another fix for the strchr() transition: Check for NULL arguments.