Better handling of empty comments