Removes TODO comment to add extra err parameter.