Add guards to CSV-rendering