Update the fields parser to return nil for invalid input