Improved error reporting, attempting to fix tach migration bug.