Add additional logging and fix a leak on an error path.