Revert some logging and polish the code to fail.