Fix AttributeError if added or recorded is None