[FOLD] more tightening of failure and logging