more resliency and info on failure