More None checks