Added error registration and Viking ToT