Do we need to check for nil here too like the above check for invalidated_at?