How about we just check if `S3_BUCKET_NAME is not None` and only then prepend `S3_BUCKET_NAME ` and `.` to `S3_BUCKET_DOMAIN`?