Do you think we should just log the error and ignore the add()? (The current version is throwing after the merged PR from yesterday)