Add additional checks to trackedInfos usage

Closes #115