Guard against submitter being None here as well