Making sure multiple includes of the registry does not result in major issues with error detection (earlier work suggested a possible issue with this)